fix link on libpython2.7.so, by not using libpython2.7.so.1.0, as it doesn't appear in final APK, and platform < Android 6 cannot load it (tested on 5 and 5.1, they said libmain.so is missing libpython2.7.so.1.0 while libpython2.7.so was there).

tito · tito · commit 15a3770b403f · 2019-01-08T10:48:34.000+01:00
Symlink is not possible, and there is no purpose of having 2 same libraries. Just having INSTSONAME set to libpython2.7.so works and all the linking is correct for everything that depends on it.

Old Python 2 recipe was having a fix for that, but got removed when using the GuestPythonRecipe
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -32,6 +32,7 @@ class Python2Recipe(GuestPythonRecipe):
                'patches/fix-filesystem-default-encoding.patch',
                'patches/fix-locale.patch',
                'patches/fix-init-site.patch',
+               'patches/fix-python2-instsoname.patch'
                ]
 
     configure_args = ('--host={android_host}',
@@ -62,6 +63,14 @@ def set_libs_flags(self, env, arch):
             openssl_build = recipe.get_build_dir(arch.arch)
             env['OPENSSL_BUILD'] = openssl_build
             env['OPENSSL_VERSION'] = recipe.version
+
+            # XXX got issue with atomic?
+            # .../openssl/libcrypto1.1.so: error: undefined reference to '__atomic_fetch_add_4'
+            # .../openssl/libcrypto1.1.so: error: undefined reference to '__atomic_fetch_sub_4'
+            # .../openssl/libcrypto1.1.so: error: undefined reference to '__atomic_store'
+            # .../openssl/libcrypto1.1.so: error: undefined reference to '__atomic_load'
+            # .../openssl/libcrypto1.1.so: error: undefined reference to '__atomic_is_lock_free'
+            env['LDFLAGS'] += ' -latomic'
         return env
 
 
diff --git a/pythonforandroid/recipes/python2/patches/fix-python2-instsoname.patch b/pythonforandroid/recipes/python2/patches/fix-python2-instsoname.patch
@@ -0,0 +1,10 @@
+--- a/configure	2019-01-08 09:55:21.552820223 +0100
++++ b/configure	2019-01-08 09:55:28.752658401 +0100
+@@ -5490,7 +5490,6 @@
+ 		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
+ 		;;
+ 	  esac
+-	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  ;;
+     hp*|HP*)
+ 	  case `uname -m` in
