From 6c5d2f2468853049b51e06c26a4c6676c201d991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 12 Sep 2024 16:54:43 +0200 Subject: [PATCH] testing/openssl1.1-compat: move libraries from /lib to /usr/lib --- testing/openssl1.1-compat/APKBUILD | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/testing/openssl1.1-compat/APKBUILD b/testing/openssl1.1-compat/APKBUILD index c3a40165e42..fb31eaa701e 100644 --- a/testing/openssl1.1-compat/APKBUILD +++ b/testing/openssl1.1-compat/APKBUILD @@ -3,7 +3,7 @@ pkgname=openssl1.1-compat pkgver=1.1.1w _abiver=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="toolkit for transport layer security (TLS) - version 1.1" url="https://www.openssl.org/" arch="all" @@ -104,7 +104,7 @@ build() { perl ./Configure \ $_target \ --prefix=/usr \ - --libdir=lib \ + --libdir=/usr/lib \ --openssldir=/etc/ssl1.1 \ shared \ no-zlib \ @@ -145,23 +145,16 @@ package() { _libcrypto() { pkgdesc="Crypto library from openssl" replaces="libressl2.7-libcrypto" - mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib - mv "$pkgdir"/etc "$subpkgdir"/ - for i in "$pkgdir"/usr/lib/libcrypto*; do - mv $i "$subpkgdir"/lib/ - ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/} - done - mv "$pkgdir"/usr/lib/engines-$_abiver "$subpkgdir"/usr/lib/ + + amove etc + amove usr/lib/libcrypto* + amove usr/lib/engines-$_abiver } _libssl() { pkgdesc="SSL shared libraries" - mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib - for i in "$pkgdir"/usr/lib/libssl*; do - mv $i "$subpkgdir"/lib/ - ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/} - done + amove usr/lib/libssl* } _static() {