From cff4cb93328b40e92c2fcaf8a4cbe4dbba9b3653 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 18 Jan 2020 12:17:52 +0100 Subject: [PATCH] Add symlinks for suffixed dynamic libs --- .SRCINFO | 2 +- PKGBUILD | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9c0b54bf242c..f8d9c1dd6467 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = android-x86-openssl pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (Android, x86) pkgver = 1.1.1.d - pkgrel = 2 + pkgrel = 3 url = https://www.openssl.org arch = any license = custom:BSD diff --git a/PKGBUILD b/PKGBUILD index 90215b1f62c1..9f8a2900307b 100644 --- a/PKGBUILD +++ b/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 {} \;