diff --git a/APKBUILD b/APKBUILD index fd45dab..e3681d7 100644 --- a/APKBUILD +++ b/APKBUILD @@ -2,8 +2,8 @@ pkgname="glibc" pkgver="2.35" -_pkgrel="0" -pkgrel="0" +_pkgrel="1" +pkgrel="1" pkgdesc="GNU C Library compatibility layer" arch="x86_64" url="https://github.com/sgerrand/alpine-pkg-glibc" @@ -13,9 +13,11 @@ 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 + conflicts="libc6-compat" + 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,12 +30,13 @@ 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 } bin() { - depends="$pkgname bash libc6-compat libgcc" + depends="$pkgname bash libgcc" mkdir -p "$subpkgdir"/usr/glibc-compat cp -a "$srcdir"/usr/glibc-compat/bin "$subpkgdir"/usr/glibc-compat cp -a "$srcdir"/usr/glibc-compat/sbin "$subpkgdir"/usr/glibc-compat