Migrating recipes...

Author: misl6

ci/constants.py

@@ -32,6 +32,9 @@ class TargetPython(Enum):
     'zope_interface',
     # Requires zope_interface, which is broken.
     'twisted',
+    'icu',
+    'genericndkbuild',
+    'evdev'
 ])
 
 BROKEN_RECIPES = {

pythonforandroid/archs.py

@@ -167,12 +167,10 @@ def get_env(self, with_flags_in_cc=True):
             )
 
         # Compiler: `CC` and `CXX` (and make sure that the compiler exists)
-        environ['PATH'] = '{clang_path}:{path}'.format(
-            clang_path=self.clang_path, path=environ['PATH']
-        )
-        cc = find_executable(self.clang_exe, path=environ['PATH'])
+        env['PATH'] = self.ctx.env['PATH']
+        cc = find_executable(self.clang_exe, path=env['PATH'])
         if cc is None:
-            print('Searching path are: {!r}'.format(environ['PATH']))
+            print('Searching path are: {!r}'.format(env['PATH']))
             raise BuildInterruptingException(
                 'Couldn\'t find executable for CC. This indicates a '
                 'problem locating the {} executable in the Android '
@@ -221,8 +219,6 @@ def get_env(self, with_flags_in_cc=True):
             ),
         )
 
-        env['PATH'] = environ['PATH']
-
         # for reproducible builds
         if 'SOURCE_DATE_EPOCH' in environ:
             for k in 'LC_ALL TZ SOURCE_DATE_EPOCH PYTHONHASHSEED BUILD_DATE BUILD_TIME'.split():

pythonforandroid/build.py

@@ -368,7 +368,7 @@ def prepare_build_environment(self,
         self.ndk_sysroot, ndk_sysroot_exists = get_ndk_sysroot(self.ndk_dir)
         self.ndk_include_dir = join(self.ndk_sysroot, 'usr', 'include')
 
-        environ["PATH"] = ":".join(
+        self.env["PATH"] = ":".join(
             [
                 f"{ndk_dir}/toolchains/llvm/prebuilt/{py_platform}-x86_64/bin",
                 ndk_dir,

pythonforandroid/recipe.py

@@ -818,7 +818,7 @@ def build_arch(self, arch, *extra_args):
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):
             shprint(
-                sh.ndk_build,
+                sh.Command(f"{self.ctx.ndk_dir}/ndk-build"),
                 'V=1',
                 'NDK_DEBUG=' + ("1" if self.ctx.build_as_debuggable else "0"),
                 'APP_PLATFORM=android-' + str(self.ctx.ndk_api),
@@ -1142,7 +1142,6 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
         env['LDSHARED'] = env['CC'] + ' -shared'
         # shprint(sh.whereis, env['LDSHARED'], _env=env)
         env['LIBLINK'] = 'NOTNONE'
-        env['NDKPLATFORM'] = self.ctx.ndk_sysroot  # FIXME?
         if self.ctx.copy_libs:
             env['COPYLIBS'] = '1'
 

pythonforandroid/recipes/evdev/__init__.py

@@ -18,6 +18,7 @@ class EvdevRecipe(CompiledComponentsPythonRecipe):
 
     def get_recipe_env(self, arch=None):
         env = super().get_recipe_env(arch)
+        env['SYSROOT'] = self.ctx.ndk_sysroot
         return env
 
 

pythonforandroid/recipes/evdev/include-dir.patch

@@ -6,7 +6,7 @@ diff -Naur orig/setup.py v0.4.7/setup.py
  #-----------------------------------------------------------------------------
  def create_ecodes():
 -    header = '/usr/include/linux/input.h'
-+    header = os.environ['NDKPLATFORM'] + '/usr/include/linux/input.h'
++    header = os.environ['SYSROOT'] + '/usr/include/linux/input.h'
 
      if not os.path.isfile(header):
          msg = '''\

pythonforandroid/recipes/fontconfig/__init__.py

@@ -13,7 +13,13 @@ def build_arch(self, arch):
         env = self.get_recipe_env(arch)
 
         with current_directory(self.get_jni_dir()):
-            shprint(sh.ndk_build, "V=1", 'fontconfig', _env=env)
+            shprint(
+                sh.Command(f"{self.ctx.ndk_dir}/ndk-build"),
+                "V=1",
+                "APP_ALLOW_MISSING_DEPS=true",
+                "fontconfig",
+                _env=env,
+            )
 
 
 recipe = FontconfigRecipe()

pythonforandroid/recipes/genericndkbuild/__init__.py

@@ -25,7 +25,7 @@ def build_arch(self, arch):
         env = self.get_recipe_env(arch)
 
         with current_directory(self.get_jni_dir()):
-            shprint(sh.ndk_build, "V=1", _env=env)
+            shprint(sh.Command(f"{self.ctx.ndk_dir}/ndk-build"), "V=1", _env=env)
 
 
 recipe = GenericNDKBuildRecipe()

pythonforandroid/recipes/icu/__init__.py

@@ -1,5 +1,6 @@
 import sh
 import os
+import platform
 from os.path import join, isdir, exists
 from multiprocessing import cpu_count
 from pythonforandroid.recipe import Recipe
@@ -64,7 +65,7 @@ def make_build_dest(dest):
             return build_dest, True
 
         icu_build = join(build_root, "icu_build")
-        build_linux, exists = make_build_dest("build_icu_linux")
+        build_host, exists = make_build_dest("build_icu_host")
 
         host_env = os.environ.copy()
         # reduce the function set
@@ -75,12 +76,15 @@ def make_build_dest(dest):
             "-DUCONFIG_NO_TRANSLITERATION=0 ")
 
         if not exists:
+            icu4c_host_platform = platform.system()
+            if icu4c_host_platform == "Darwin":
+                icu4c_host_platform = "MacOSX"
             configure = sh.Command(
                 join(build_root, "source", "runConfigureICU"))
-            with current_directory(build_linux):
+            with current_directory(build_host):
                 shprint(
                     configure,
-                    "Linux",
+                    icu4c_host_platform,
                     "--prefix="+icu_build,
                     "--enable-extras=no",
                     "--enable-strict=no",
@@ -93,18 +97,18 @@ def make_build_dest(dest):
 
         build_android, exists = make_build_dest("build_icu_android")
         if not exists:
-
             configure = sh.Command(join(build_root, "source", "configure"))
 
             with current_directory(build_android):
                 shprint(
                     configure,
-                    "--with-cross-build="+build_linux,
+                    "--with-cross-build="+build_host,
                     "--enable-extras=no",
                     "--enable-strict=no",
                     "--enable-static=no",
                     "--enable-tests=no",
                     "--enable-samples=no",
+                    "--host="+arch.command_prefix,
                     "--prefix="+icu_build,
                     _env=env)
                 shprint(sh.make, "-j", str(cpu_count()), _env=env)

pythonforandroid/recipes/libzbar/__init__.py

@@ -33,7 +33,7 @@ def build_arch(self, arch):
             shprint(
                 sh.Command('./configure'),
                 '--host=' + arch.command_prefix,
-                '--target=' + arch.toolchain_prefix,
+                # '--target=' + arch.toolchain_prefix,
                 '--prefix=' + self.ctx.get_python_install_dir(arch.arch),
                 # Python bindings are compiled in a separated recipe
                 '--with-python=no',

pythonforandroid/recipes/openal/__init__.py

@@ -1,7 +1,6 @@
 from pythonforandroid.recipe import NDKRecipe
 from pythonforandroid.toolchain import current_directory, shprint
 from os.path import join
-import os
 import sh
 
 
@@ -11,12 +10,6 @@ class OpenALRecipe(NDKRecipe):
 
     generated_libraries = ['libopenal.so']
 
-    def prebuild_arch(self, arch):
-        # we need to build native tools for host system architecture
-        with current_directory(join(self.get_build_dir(arch.arch), 'native-tools')):
-            shprint(sh.cmake, '.', _env=os.environ)
-            shprint(sh.make, _env=os.environ)
-
     def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             env = self.get_recipe_env(arch)

pythonforandroid/recipes/sdl2/__init__.py

@@ -30,7 +30,7 @@ def build_arch(self, arch):
 
         with current_directory(self.get_jni_dir()):
             shprint(
-                sh.ndk_build,
+                sh.Command(f"{self.ctx.ndk_dir}/ndk-build"),
                 "V=1",
                 "NDK_DEBUG=" + ("1" if self.ctx.build_as_debuggable else "0"),
                 _env=env

pythonforandroid/recipes/zope/__init__.py

@@ -17,6 +17,7 @@ def get_recipe_env(self, arch):
         env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
             self.ctx.get_libs_dir(arch.arch))
         env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink')
+        return env
 
     def postbuild_arch(self, arch):
         super().postbuild_arch(arch)