From bd2e2426011620f83dfb034e2e56feec7c602811 Mon Sep 17 00:00:00 2001 From: "Khalifah K. Shabazz" <619281+b01@users.noreply.github.com> Date: Tue, 4 Jun 2024 07:05:52 -0400 Subject: [PATCH] chg: Conflicting Packages Updated the APK build to list libc6-compat as a conflicting package. resolves #179. --- APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/APKBUILD b/APKBUILD index 58d2fed..6e6fd54 100644 --- a/APKBUILD +++ b/APKBUILD @@ -15,7 +15,7 @@ subpackages="$pkgname-bin $pkgname-utils $pkgname-dev $pkgname-i18n" triggers="$pkgname-bin.trigger=/lib:/usr/lib:/usr/glibc-compat/lib" package() { - provides="libc6-compat" + provides="gnu-c-lib" 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" @@ -39,6 +39,7 @@ bin() { depends="$pkgname libgcc" depends="$depends bash" # shebang for ldd, sotrus, tzselect, xtrace depends="$depends perl" # shebang for mtrace + depends="$depends !libc6-compat" # conflicts with this package 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