Add dateutil recipe and fix icu recipe

ziererf · ziererf · commit b025f4eefe4e · 2017-04-11T20:53:55.000+02:00
diff --git a/pythonforandroid/recipes/dateutil/__init__.py b/pythonforandroid/recipes/dateutil/__init__.py
@@ -0,0 +1,14 @@
+from pythonforandroid.recipe import PythonRecipe
+
+
+class DateutilRecipe(PythonRecipe):
+	name = 'dateutil'
+	version = '2.6.0'
+	url = 'https://pypi.python.org/packages/3e/f5/aad82824b369332a676a90a8c0d1e608b17e740bbb6aeeebca726f17b902/python-dateutil-{version}.tar.gz'
+
+	depends = ['python2', "setuptools"]
+	call_hostpython_via_targetpython = False
+	install_in_hostpython = True
+
+
+recipe = DateutilRecipe()
diff --git a/pythonforandroid/recipes/icu/__init__.py b/pythonforandroid/recipes/icu/__init__.py
@@ -11,7 +11,7 @@ class ICURecipe(NDKRecipe):
     version = '57.1'
     url = 'http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz'
 
-    depends = [('python2', 'python3crystax')]  # installs in python
+    depends = [('python2', 'python3crystax'), 'hostpython2']  # installs in python
     generated_libraries = [
         'libicui18n.so', 'libicuuc.so', 'libicudata.so', 'libicule.so']
 
@@ -68,50 +68,48 @@ def make_build_dest(dest):
                 shprint(sh.make, "install", _env=host_env)
 
         build_android, exists = make_build_dest("build_icu_android")
-        if exists:
-            return
-
-        configure = sh.Command(join(build_root, "source", "configure"))
-
-        include = (
-            " -I{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/include/"
-            " -I{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/libs/"
-            "{arch}/include")
-        include = include.format(ndk=self.ctx.ndk_dir,
-                                 version=env["TOOLCHAIN_VERSION"],
-                                 arch=arch.arch)
-        env["CPPFLAGS"] = env["CXXFLAGS"] + " "
-        env["CPPFLAGS"] += host_env["CPPFLAGS"]
-        env["CPPFLAGS"] += include
+        if not exists:
 
-        lib = "{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/libs/{arch}"
-        lib = lib.format(ndk=self.ctx.ndk_dir,
-                         version=env["TOOLCHAIN_VERSION"],
-                         arch=arch.arch)
-        env["LDFLAGS"] += " -lgnustl_shared -L"+lib
-
-        env.pop("CFLAGS", None)
-        env.pop("CXXFLAGS", None)
-
-        with current_directory(build_android):
-            shprint(
-                configure,
-                "--with-cross-build="+build_linux,
-                "--enable-extras=no",
-                "--enable-strict=no",
-                "--enable-static",
-                "--enable-tests=no",
-                "--enable-samples=no",
-                "--host="+env["TOOLCHAIN_PREFIX"],
-                "--prefix="+icu_build,
-                _env=env)
-            shprint(sh.make, "-j5", _env=env)
-            shprint(sh.make, "install", _env=env)
+            configure = sh.Command(join(build_root, "source", "configure"))
+
+            include = (
+                " -I{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/include/"
+                " -I{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/libs/"
+                "{arch}/include")
+            include = include.format(ndk=self.ctx.ndk_dir,
+                                     version=env["TOOLCHAIN_VERSION"],
+                                     arch=arch.arch)
+            env["CPPFLAGS"] = env["CXXFLAGS"] + " "
+            env["CPPFLAGS"] += host_env["CPPFLAGS"]
+            env["CPPFLAGS"] += include
+
+            lib = "{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/libs/{arch}"
+            lib = lib.format(ndk=self.ctx.ndk_dir,
+                             version=env["TOOLCHAIN_VERSION"],
+                             arch=arch.arch)
+            env["LDFLAGS"] += " -lgnustl_shared -L"+lib
+
+            env.pop("CFLAGS", None)
+            env.pop("CXXFLAGS", None)
+
+            with current_directory(build_android):
+                shprint(
+                    configure,
+                    "--with-cross-build="+build_linux,
+                    "--enable-extras=no",
+                    "--enable-strict=no",
+                    "--enable-static",
+                    "--enable-tests=no",
+                    "--enable-samples=no",
+                    "--host="+env["TOOLCHAIN_PREFIX"],
+                    "--prefix="+icu_build,
+                    _env=env)
+                shprint(sh.make, "-j5", _env=env)
+                shprint(sh.make, "install", _env=env)
 
         self.copy_files(arch)
 
     def copy_files(self, arch):
-        ndk = self.ctx.ndk_dir
         env = self.get_recipe_env(arch)
 
         lib = "{ndk}/sources/cxx-stl/gnu-libstdc++/{version}/libs/{arch}"
