snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cross/gcc-*: fix conflict with native gcc

Browse Source 
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
This commit is contained in:
Oliver Smith
2025-05-11 18:21:59 +02:00
parent 905a0683c4
commit 7337f3d698
6 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cross/gcc-aarch64/APKBUILD
-1
View File
@@ -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
cross/gcc-armhf/APKBUILD
-1
View File
@@ -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
cross/gcc-armv7/APKBUILD
-1
View File
@@ -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
cross/gcc-riscv64/APKBUILD
-1
View File
@@ -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
cross/gcc-x86/APKBUILD
-1
View File
@@ -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
cross/gcc-x86_64/APKBUILD
-1
View File
@@ -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