Clean-up LDSHARED, fixes #1360

Since #1361 was merged, we can drop LDSHARED override.
Also pined `secp256k1-py` version and couple of other fixes.

Author: AndreMiras

pythonforandroid/recipes/pycryptodome/__init__.py

@@ -6,11 +6,5 @@ class PycryptodomeRecipe(PythonRecipe):
     url = 'https://github.com/Legrandin/pycryptodome/archive/v{version}.tar.gz'
     depends = ['setuptools', 'cffi']
 
-    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
-        env = super(PycryptodomeRecipe, self).get_recipe_env(arch, with_flags_in_cc)
-        # sets linker to use the correct gcc (cross compiler)
-        env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
-        return env
-
 
 recipe = PycryptodomeRecipe()

pythonforandroid/recipes/secp256k1/__init__.py

@@ -1,10 +1,11 @@
 import os
-from pythonforandroid.recipe import PythonRecipe
+from pythonforandroid.recipe import CppCompiledComponentsPythonRecipe
 
 
-class Secp256k1Recipe(PythonRecipe):
+class Secp256k1Recipe(CppCompiledComponentsPythonRecipe):
 
-    url = 'https://github.com/ludbb/secp256k1-py/archive/master.zip'
+    version = '0.13.2.4'
+    url = 'https://github.com/ludbb/secp256k1-py/archive/{version}.tar.gz'
 
     call_hostpython_via_targetpython = False
 
@@ -17,29 +18,12 @@ class Secp256k1Recipe(PythonRecipe):
         "cross_compile.patch", "drop_setup_requires.patch",
         "pkg-config.patch", "find_lib.patch", "no-download.patch"]
 
-    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
-        env = super(Secp256k1Recipe, self).get_recipe_env(arch, with_flags_in_cc)
-        # sets linker to use the correct gcc (cross compiler)
-        env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
+    def get_recipe_env(self, arch=None):
+        env = super(Secp256k1Recipe, self).get_recipe_env(arch)
         libsecp256k1 = self.get_recipe('libsecp256k1', self.ctx)
         libsecp256k1_dir = libsecp256k1.get_build_dir(arch.arch)
-        env['LDFLAGS'] += ' -L{}'.format(libsecp256k1_dir)
-        env['CFLAGS'] = ' -I' + os.path.join(libsecp256k1_dir, 'include')
-        # only keeps major.minor (discards patch)
-        python_version = self.ctx.python_recipe.version[0:3]
-        # required additional library and path for Crystax
-        if self.ctx.ndk == 'crystax':
-            ndk_dir_python = os.path.join(self.ctx.ndk_dir, 'sources/python/', python_version)
-            env['LDFLAGS'] += ' -L{}'.format(os.path.join(ndk_dir_python, 'libs', arch.arch))
-            env['LDFLAGS'] += ' -lpython{}m'.format(python_version)
-            # until `pythonforandroid/archs.py` gets merged upstream:
-            # https://github.com/kivy/python-for-android/pull/1250/files#diff-569e13021e33ced8b54385f55b49cbe6
-            env['CFLAGS'] += ' -I{}/include/python/'.format(ndk_dir_python)
-        else:
-            env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
-            env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python{}'.format(python_version)
-            env['LDFLAGS'] += " -lpython{}".format(python_version)
-        env['LDFLAGS'] += " -lsecp256k1"
+        env['CFLAGS'] += ' -I' + os.path.join(libsecp256k1_dir, 'include')
+        env['LDFLAGS'] += ' -L{} -lsecp256k1'.format(libsecp256k1_dir)
         return env