Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages / 
gcc14


Commits:
bf36d6eb by Jakub Klinkovský at 2025-05-01T10:51:42+02:00
upgpkg: 14.2.1+r753+g1cd744a6828f-2: remove libgcc_s.so* from the correct 
location

The location seems to have changed in version 13 or before and the previous rm
command does nothing. This makes it possible to install gcc14 along with the
gcc13 package which still provides 
/usr/lib/gcc/x86_64-pc-linux-gnu/lib/libgcc_s.so

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gcc14
        pkgdesc = The GNU Compiler Collection (14.x.x)
        pkgver = 14.2.1+r753+g1cd744a6828f
-       pkgrel = 1
+       pkgrel = 2
        url = https://gcc.gnu.org
        arch = x86_64
        license = GPL-3.0-with-GCC-exception


=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@ pkgname=(gcc14 gcc14-libs gcc14-fortran)
 pkgver=14.2.1+r753+g1cd744a6828f
 _commit=1cd744a6828f6ab9179906d16434ea40b6404737
 _majorver=${pkgver%%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc='The GNU Compiler Collection (14.x.x)'
 arch=(x86_64)
 license=(GPL-3.0-with-GCC-exception GFDL-1.3-or-later)
@@ -179,7 +179,8 @@ package_gcc14() {
   install -m755 -t "$pkgdir/${_libdir}/" 
gcc/{cc1,cc1plus,collect2,lto1,gcov{,-tool}}
 
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install
-  rm -f "$pkgdir"/usr/lib/libgcc_s.so*
+  rm -f "${pkgdir}/${_libdir}"/../lib/libgcc_s.so*
+  rmdir "${pkgdir}/${_libdir}"/../lib
 
   make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gcc14/-/commit/bf36d6ebd2f25a564af0e120e528d374dafd760a

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gcc14/-/commit/bf36d6ebd2f25a564af0e120e528d374dafd760a
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to