proper --host for libsecp256k1, libogg, libvorbis, libcurl (kivy#2512)

accumulator · web-flow · commit ebb3927eeb8f · 2021-10-30T14:13:40.000+02:00
diff --git a/pythonforandroid/recipes/libcurl/__init__.py b/pythonforandroid/recipes/libcurl/__init__.py
@@ -25,7 +25,7 @@ def build_arch(self, arch):
             dst_dir = join(self.get_build_dir(arch.arch), 'dist')
             shprint(
                 sh.Command('./configure'),
-                '--host=arm-linux-androideabi',
+                '--host={}'.format(arch.command_prefix),
                 '--enable-shared',
                 '--with-ssl={}'.format(openssl_dir),
                 '--prefix={}'.format(dst_dir),
diff --git a/pythonforandroid/recipes/libogg/__init__.py b/pythonforandroid/recipes/libogg/__init__.py
@@ -13,7 +13,7 @@ def build_arch(self, arch):
             env = self.get_recipe_env(arch)
             flags = [
                 '--with-sysroot=' + arch.ndk_platform,
-                '--host=' + arch.toolchain_prefix,
+                '--host=' + arch.command_prefix,
             ]
             configure = sh.Command('./configure')
             shprint(configure, *flags, _env=env)
diff --git a/pythonforandroid/recipes/libsecp256k1/__init__.py b/pythonforandroid/recipes/libsecp256k1/__init__.py
@@ -19,7 +19,7 @@ def build_arch(self, arch):
                 shprint(sh.Command('./autogen.sh'), _env=env)
             shprint(
                 sh.Command('./configure'),
-                '--host=' + arch.toolchain_prefix,
+                '--host=' + arch.command_prefix,
                 '--prefix=' + self.ctx.get_python_install_dir(arch.arch),
                 '--enable-shared',
                 '--enable-module-recovery',
diff --git a/pythonforandroid/recipes/libvorbis/__init__.py b/pythonforandroid/recipes/libvorbis/__init__.py
@@ -22,7 +22,7 @@ def build_arch(self, arch):
             env = self.get_recipe_env(arch)
             flags = [
                 '--with-sysroot=' + arch.ndk_platform,
-                '--host=' + arch.toolchain_prefix,
+                '--host=' + arch.command_prefix,
             ]
             configure = sh.Command('./configure')
             shprint(configure, *flags, _env=env)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ def build_arch(self, arch):`
`13`	`13`	`env = self.get_recipe_env(arch)`
`14`	`14`	`flags = [`
`15`	`15`	`'--with-sysroot=' + arch.ndk_platform,`
`16`		`- '--host=' + arch.toolchain_prefix,`
	`16`	`+ '--host=' + arch.command_prefix,`
`17`	`17`	`]`
`18`	`18`	`configure = sh.Command('./configure')`
`19`	`19`	`shprint(configure, *flags, _env=env)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def build_arch(self, arch):`
`22`	`22`	`env = self.get_recipe_env(arch)`
`23`	`23`	`flags = [`
`24`	`24`	`'--with-sysroot=' + arch.ndk_platform,`
`25`		`- '--host=' + arch.toolchain_prefix,`
	`25`	`+ '--host=' + arch.command_prefix,`
`26`	`26`	`]`
`27`	`27`	`configure = sh.Command('./configure')`
`28`	`28`	`shprint(configure, *flags, _env=env)`