From 42324a6d46a0d339d3abad70e9acd4fdafd1c65b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 18 Jan 2020 12:04:21 +0100
Subject: [PATCH] Add symlinks for suffixed dynamic libs of android-*-openssl

---
 openssl/android-aarch64/PKGBUILD     | 7 ++++++-
 openssl/android-armv7a-eabi/PKGBUILD | 7 ++++++-
 openssl/android-x86-64/PKGBUILD      | 7 ++++++-
 openssl/android-x86/PKGBUILD         | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/openssl/android-aarch64/PKGBUILD b/openssl/android-aarch64/PKGBUILD
index 4dda4e90..818094d0 100644
--- a/openssl/android-aarch64/PKGBUILD
+++ b/openssl/android-aarch64/PKGBUILD
@@ -10,7 +10,7 @@ _ver=1.1.1d
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=3
 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)"
 arch=('any')
 url='https://www.openssl.org'
@@ -72,6 +72,11 @@ package() {
   cp -r include/openssl "$pkgdir/${ANDROID_PREFIX_INCLUDE}"
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
+  # add symlinks for dynamic libs with SHLIB_EXT so build scripts can find them under their usual names
+  for lib in libcrypto libssl; do
+    ln -s "${lib}_1_1.so" "${pkgdir}/${ANDROID_PREFIX_LIB}/${lib}.so"
+  done
+
   # strip binaries
   find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
   find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
diff --git a/openssl/android-armv7a-eabi/PKGBUILD b/openssl/android-armv7a-eabi/PKGBUILD
index 61983928..ca1b400a 100644
--- a/openssl/android-armv7a-eabi/PKGBUILD
+++ b/openssl/android-armv7a-eabi/PKGBUILD
@@ -10,7 +10,7 @@ _ver=1.1.1d
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=3
 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)"
 arch=('any')
 url='https://www.openssl.org'
@@ -72,6 +72,11 @@ package() {
   cp -r include/openssl "$pkgdir/${ANDROID_PREFIX_INCLUDE}"
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
+  # add symlinks for dynamic libs with SHLIB_EXT so build scripts can find them under their usual names
+  for lib in libcrypto libssl; do
+    ln -s "${lib}_1_1.so" "${pkgdir}/${ANDROID_PREFIX_LIB}/${lib}.so"
+  done
+
   # strip binaries
   find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
   find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
diff --git a/openssl/android-x86-64/PKGBUILD b/openssl/android-x86-64/PKGBUILD
index e3645734..780b8f8b 100644
--- a/openssl/android-x86-64/PKGBUILD
+++ b/openssl/android-x86-64/PKGBUILD
@@ -10,7 +10,7 @@ _ver=1.1.1d
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=3
 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)"
 arch=('any')
 url='https://www.openssl.org'
@@ -72,6 +72,11 @@ package() {
   cp -r include/openssl "$pkgdir/${ANDROID_PREFIX_INCLUDE}"
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
+  # add symlinks for dynamic libs with SHLIB_EXT so build scripts can find them under their usual names
+  for lib in libcrypto libssl; do
+    ln -s "${lib}_1_1.so" "${pkgdir}/${ANDROID_PREFIX_LIB}/${lib}.so"
+  done
+
   # strip binaries
   find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
   find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;
diff --git a/openssl/android-x86/PKGBUILD b/openssl/android-x86/PKGBUILD
index 90215b1f..9f8a2900 100644
--- a/openssl/android-x86/PKGBUILD
+++ b/openssl/android-x86/PKGBUILD
@@ -10,7 +10,7 @@ _ver=1.1.1d
 pkgname=android-$_pkg_arch-$_pkgname
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-pkgrel=2
+pkgrel=3
 pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, $_pkg_arch)"
 arch=('any')
 url='https://www.openssl.org'
@@ -72,6 +72,11 @@ package() {
   cp -r include/openssl "$pkgdir/${ANDROID_PREFIX_INCLUDE}"
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
+  # add symlinks for dynamic libs with SHLIB_EXT so build scripts can find them under their usual names
+  for lib in libcrypto libssl; do
+    ln -s "${lib}_1_1.so" "${pkgdir}/${ANDROID_PREFIX_LIB}/${lib}.so"
+  done
+
   # strip binaries
   find "$pkgdir" -name 'lib*.so' -type f -exec "$ANDROID_STRIP" --strip-unneeded {} \;
   find "$pkgdir" -name 'lib*.a' -type f -exec "$ANDROID_STRIP" -g {} \;