Fixes pyleveldb recipe

AndreMiras · AndreMiras · commit 6c31e108b733 · 2019-02-10T12:17:06.000+01:00
diff --git a/ci/constants.py b/ci/constants.py
@@ -39,8 +39,6 @@ class TargetPython(Enum):
     'protobuf_cpp',
     'xeddsa',
     'x3dh',
-    # fatal error: crypt.h: No such file or directory
-    'pyleveldb',
     'pynacl',
     'doubleratchet',
     # The opencv recipe fails to pass travis tests due to the long processing
@@ -85,8 +83,6 @@ class TargetPython(Enum):
     'opencv',
     # requires `libpq-dev` system dependency e.g. for `pg_config` binary
     'psycopg2',
-    # fatal error: crypt.h: No such file or directory
-    'pyleveldb',
     'protobuf_cpp',
     # most likely some setup in the Docker container, because it works in host
     'pyjnius', 'pyopenal',
diff --git a/pythonforandroid/recipes/pyleveldb/__init__.py b/pythonforandroid/recipes/pyleveldb/__init__.py
@@ -1,33 +1,13 @@
-from pythonforandroid.recipe import CompiledComponentsPythonRecipe
-from pythonforandroid.toolchain import current_directory
-import sh
+from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
 
 
-class PyLevelDBRecipe(CompiledComponentsPythonRecipe):
+class PyLevelDBRecipe(CppCompiledComponentsPythonRecipe):
     version = '0.193'
     url = 'https://pypi.python.org/packages/source/l/leveldb/leveldb-{version}.tar.gz'
     depends = ['snappy', 'leveldb', ('hostpython2', 'hostpython3'), 'setuptools']
     patches = ['bindings-only.patch']
     call_hostpython_via_targetpython = False  # Due to setuptools
     site_packages_name = 'leveldb'
 
-    def build_arch(self, arch):
-        with current_directory(self.get_build_dir(arch.arch)):
-            # Remove source in this pypi package
-            sh.rm('-rf', 'leveldb', 'leveldb.egg-info', 'snappy')
-            # Use source from leveldb recipe
-            sh.ln('-s', self.get_recipe('leveldb', self.ctx).get_build_dir(arch.arch), 'leveldb')
-        # Build and install python bindings
-        super(PyLevelDBRecipe, self).build_arch(arch)
-
-    def get_recipe_env(self, arch):
-        env = super(PyLevelDBRecipe, self).get_recipe_env(arch)
-        # Copy environment from leveldb recipe
-        env.update(self.get_recipe('leveldb', self.ctx).get_recipe_env(arch))
-        # Set linker to use the correct gcc
-        env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
-        env['LDFLAGS'] += ' -lleveldb'
-        return env
-
 
 recipe = PyLevelDBRecipe()
