From ea066664d784ded04dbcf1d75e3253b2cdc5f29c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 1 Nov 2024 10:04:45 -0400 Subject: [PATCH] backports/openssl1.1-compat: bump pkgrel --- backports/openssl1.1-compat/APKBUILD | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/backports/openssl1.1-compat/APKBUILD b/backports/openssl1.1-compat/APKBUILD index 294cbc1..fb31eaa 100644 --- a/backports/openssl1.1-compat/APKBUILD +++ b/backports/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" @@ -86,6 +86,7 @@ build() { x86_64) _target="linux-x86_64"; _optflags="enable-ec_nistp_64_gcc_128" ;; s390x) _target="linux64-s390x";; riscv64) _target="linux-generic64";; + loongarch64) _target="linux-generic64";; *) msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;; esac @@ -103,7 +104,7 @@ build() { perl ./Configure \ $_target \ --prefix=/usr \ - --libdir=lib \ + --libdir=/usr/lib \ --openssldir=/etc/ssl1.1 \ shared \ no-zlib \ @@ -144,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() {