Undo rename openssl x.so files

brussee · Mar 15, 2016 · 72afe0f · 72afe0f
1 parent 198e309
commit 72afe0f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 28 deletions.
diff --git a/pythonforandroid/recipes/libtorrent/user-config-openssl.patch b/pythonforandroid/recipes/libtorrent/user-config-openssl.patch
@@ -20,6 +20,6 @@
 +<linkflags>-L$(OPENSSL_BUILD_PATH)
  <linkflags>-lgnustl_shared
  <linkflags>-lpython2.7
-+<linkflags>-lcryptox
-+<linkflags>-lsslx
++<linkflags>-lcrypto
++<linkflags>-lssl
  ;
diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -2,15 +2,14 @@
 
 from pythonforandroid.toolchain import Recipe, shprint, current_directory
 import sh
-from os.path import join
 
 
 class OpenSSLRecipe(Recipe):
     version = '1.0.2g'
     url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'
 
     def should_build(self, arch):
-        return not self.has_libs(arch, 'libsslx.so', 'libcryptox.so')
+        return not self.has_libs(arch, 'libssl.so', 'libcrypto.so')
 
     def check_symbol(self, env, sofile, symbol):
         nm = env.get('NM', 'nm')
@@ -45,9 +44,7 @@ def build_arch(self, arch):
             perl = sh.Command('perl')
             buildarch = self.select_build_arch(arch)
             shprint(perl, 'Configure', 'shared', 'no-dso', 'no-krb5', buildarch, _env=env)
-
             self.apply_patch('disable-sover.patch', arch.arch)
-            self.apply_patch('fix-shared-link.patch', arch.arch)
 
             check_crypto = partial(self.check_symbol, env, 'libcrypto.so')
             # check_ssl = partial(self.check_symbol, env, 'libssl.so')
@@ -57,10 +54,6 @@ def build_arch(self, arch):
                     break
                 shprint(sh.make, 'clean', _env=env)
 
-            # MUST BE RENAMED TO AVOID CONFLICTS WITH ANDROID'S DISTRIBUTED OPENSSL (IF INCLUDED INTO THE FINAL BUILD)
-            libs_dir = self.get_build_dir(arch.arch)
-            shprint(sh.cp, "-av", join(libs_dir, 'libcrypto.so'), join(libs_dir, 'libcryptox.so'))
-            shprint(sh.cp, "-av", join(libs_dir, 'libssl.so'), join(libs_dir, 'libsslx.so'))
-            self.install_libs(arch, 'libcryptox.so', 'libsslx.so')
+            self.install_libs(arch, 'libssl.so', 'libcrypto.so')
 
 recipe = OpenSSLRecipe()
diff --git a/pythonforandroid/recipes/openssl/fix-shared-link.patch b/pythonforandroid/recipes/openssl/fix-shared-link.patch
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -163,7 +163,7 @@ def do_python_build(self, arch):
 
                 env['CFLAGS'] = ' '.join([env['CFLAGS'], '-I{}'.format(openssl_inc_dir),
                                           '-I{}/openssl'.format(openssl_inc_dir)])
-                env['LDFLAGS'] = ' '.join([env['LDFLAGS'], '-L{}'.format(openssl_libs_dir), '-lcryptox', '-lsslx'])
+                env['LDFLAGS'] = ' '.join([env['LDFLAGS'], '-L{}'.format(openssl_libs_dir), '-lcrypto', '-lssl'])
 
             if 'sqlite3' in self.ctx.recipe_build_order:
                 info("Activate flags for sqlite3")

diff --git a/pythonforandroid/recipes/python2/patches/Python-2.7.9-xcompile.patch b/pythonforandroid/recipes/python2/patches/Python-2.7.9-xcompile.patch
@@ -75,7 +75,7 @@ index 2ad1aa3..ede793f 100644
 +SSL=/path-to-ssl-build-dir
 +_ssl _ssl.c \
 +	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-+	-L$(SSL) -lsslx -lcryptox
++	-L$(SSL) -lssl -lcrypto
 
  # The crypt module is now disabled by default because it breaks builds
  # on many systems (where -lcrypt is needed), e.g. Linux (I believe).