From 60adde9317a0c79763a59504de6f28aa1e1bebd2 Mon Sep 17 00:00:00 2001 From: Pablo Sole Date: Thu, 2 Jun 2022 11:30:46 -0700 Subject: [PATCH] Add /lib64 reference again and tell abuild to allow it --- APKBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/APKBUILD b/APKBUILD index fd45dab..7a7bb7e 100644 --- a/APKBUILD +++ b/APKBUILD @@ -13,9 +13,10 @@ nsswitch.conf ld.so.conf" subpackages="$pkgname-bin $pkgname-dev $pkgname-i18n" triggers="$pkgname-bin.trigger=/lib:/usr/lib:/usr/glibc-compat/lib" +options="lib64" package() { - mkdir -p "$pkgdir/lib" "$pkgdir/usr/glibc-compat/lib/locale" "$pkgdir"/usr/glibc-compat/lib64 "$pkgdir"/etc + mkdir -p "$pkgdir/lib" "$pkgdir/lib64" "$pkgdir/usr/glibc-compat/lib/locale" "$pkgdir"/usr/glibc-compat/lib64 "$pkgdir"/etc cp -a "$srcdir"/usr "$pkgdir" cp "$srcdir"/ld.so.conf "$pkgdir"/usr/glibc-compat/etc/ld.so.conf cp "$srcdir"/nsswitch.conf "$pkgdir"/etc/nsswitch.conf @@ -28,6 +29,7 @@ package() { rm -rf "$pkgdir"/usr/glibc-compat/share rm -rf "$pkgdir"/usr/glibc-compat/var ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 ${pkgdir}/lib/ld-linux-x86-64.so.2 + ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 ${pkgdir}/lib64/ld-linux-x86-64.so.2 ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 ${pkgdir}/usr/glibc-compat/lib64/ld-linux-x86-64.so.2 ln -s /usr/glibc-compat/etc/ld.so.cache ${pkgdir}/etc/ld.so.cache }