From 7337f3d698560801016b470d142e440782f89456 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 11 May 2025 17:25:54 +0200 Subject: [PATCH] cross/gcc-*: fix conflict with native gcc Run aportgen again with pmbootstrap MR 2597 to fix the conflict when installing cross gcc and native gcc at the same time: (52/53) Installing gcc-armv7 (14.2.0-r6) ERROR: gcc-armv7-14.2.0-r6: trying to overwrite usr/lib/libgcc_s.so.1 owned by libgcc-14.2.0-r6. [ci:skip-vercheck]: for generated gccs we keep the same pkgrel as in alpine. I'll force a rebuild in BPO after merge (not ideal, but fixing this is rather urgent as cross compilation is otherwise broken in pmOS edge) [ci:skip-build]: tested locally with gcc-armv7 Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6497 --- cross/gcc-aarch64/APKBUILD | 1 - cross/gcc-armhf/APKBUILD | 1 - cross/gcc-armv7/APKBUILD | 1 - cross/gcc-riscv64/APKBUILD | 1 - cross/gcc-x86/APKBUILD | 1 - cross/gcc-x86_64/APKBUILD | 1 - 6 files changed, 6 deletions(-) diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index a0e19d0c5..657661a12 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -489,7 +489,6 @@ package() { # These are moved into packages with arch=$CTARGET_ARCH so remove # cross prefix (doesn't exist when BOOTSTRAP=nolibc) - [ "$BOOTSTRAP" != nolibc ] && mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index 669ad0986..eb2748ea7 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -489,7 +489,6 @@ package() { # These are moved into packages with arch=$CTARGET_ARCH so remove # cross prefix (doesn't exist when BOOTSTRAP=nolibc) - [ "$BOOTSTRAP" != nolibc ] && mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index 744f278a4..81e1649f8 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -489,7 +489,6 @@ package() { # These are moved into packages with arch=$CTARGET_ARCH so remove # cross prefix (doesn't exist when BOOTSTRAP=nolibc) - [ "$BOOTSTRAP" != nolibc ] && mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot diff --git a/cross/gcc-riscv64/APKBUILD b/cross/gcc-riscv64/APKBUILD index 44d9d5f6c..5dad3ca43 100644 --- a/cross/gcc-riscv64/APKBUILD +++ b/cross/gcc-riscv64/APKBUILD @@ -489,7 +489,6 @@ package() { # These are moved into packages with arch=$CTARGET_ARCH so remove # cross prefix (doesn't exist when BOOTSTRAP=nolibc) - [ "$BOOTSTRAP" != nolibc ] && mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot diff --git a/cross/gcc-x86/APKBUILD b/cross/gcc-x86/APKBUILD index 69aeeeaf0..5a0d090cc 100644 --- a/cross/gcc-x86/APKBUILD +++ b/cross/gcc-x86/APKBUILD @@ -489,7 +489,6 @@ package() { # These are moved into packages with arch=$CTARGET_ARCH so remove # cross prefix (doesn't exist when BOOTSTRAP=nolibc) - [ "$BOOTSTRAP" != nolibc ] && mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD index c0a7d9061..c45da5bac 100644 --- a/cross/gcc-x86_64/APKBUILD +++ b/cross/gcc-x86_64/APKBUILD @@ -489,7 +489,6 @@ package() { # These are moved into packages with arch=$CTARGET_ARCH so remove # cross prefix (doesn't exist when BOOTSTRAP=nolibc) - [ "$BOOTSTRAP" != nolibc ] && mv "$pkgdir"/usr/$CTARGET/lib/*.so.* "$pkgdir"/usr/lib/ # fixup gcc library symlinks to be linker scripts so # linker finds the libs from relocated sysroot