[arch-commits] Commit in gcc9/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Tuesday, June 9, 2020 @ 16:20:30
  Author: kgizdov
Revision: 640852

make sure to use program suffix

Modified:
  gcc9/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-09 16:17:46 UTC (rev 640851)
+++ PKGBUILD	2020-06-09 16:20:30 UTC (rev 640852)
@@ -94,6 +94,7 @@
       --enable-default-pie \
       --enable-default-ssp \
       --enable-cet=auto \
+      --program-suffix=-${_majorver} \
       --disable-multilib
   make
 
@@ -113,7 +114,7 @@
 }
 
 package_gcc9-libs() {
-  pkgdesc='Runtime libraries shipped by GCC'
+  pkgdesc='Runtime libraries shipped by GCC (9.x.x)'
   depends=('glibc>=2.27')
   options+=(!strip)
   provides=(libgfortran.so libubsan.so libasan.so libtsan.so liblsan.so)
@@ -141,17 +142,14 @@
     make -C $CHOST/$lib DESTDIR="$pkgdir" install-info
   done
 
-  # remove files provided by lib32-gcc-libs
-  rm -rf "$pkgdir"/usr/lib32/
-
   # Install Runtime Library Exception
   install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
-    "$pkgdir/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
+    "$pkgdir/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION"
 }
 
 package_gcc9() {
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends (9.x.x)"
+  depends=("${pkgbase}-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
   groups=('base-devel')
   options+=(staticlibs)
 
@@ -204,18 +202,15 @@
   make -C gcc DESTDIR="$pkgdir" install-po
 
   # many packages expect this symlink
-  ln -s gcc "$pkgdir"/usr/bin/cc
+  ln -s gcc-${_majorver} "$pkgdir"/usr/bin/cc-${_majorver}
 
   # POSIX conformance launcher scripts for c89 and c99
-  install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89"
-  install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99"
+  install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89-${_majorver}"
+  install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99-${_majorver}"
 
   # install the libstdc++ man pages
   make -C $CHOST/libstdc++-v3/doc DESTDIR="$pkgdir" doc-install-man
 
-  # remove files provided by lib32-gcc-libs
-  rm -f "$pkgdir"/usr/lib32/lib{stdc++,gcc_s}.so
-
   # byte-compile python libraries
   python -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
   python -O -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
@@ -222,13 +217,16 @@
 
   # Install Runtime Library Exception
   install -d "$pkgdir/usr/share/licenses/$pkgname/"
-  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+  ln -s /usr/share/licenses/${pkgbase}-libs/RUNTIME.LIBRARY.EXCEPTION \
     "$pkgdir/usr/share/licenses/$pkgname/"
+
+  # Remove conflicting files
+  rm -r "$pkgdir"/usr/share/locale
 }
 
 package_gcc9-fortran() {
-  pkgdesc='Fortran front-end for GCC'
-  depends=("gcc=$pkgver-$pkgrel")
+  pkgdesc='Fortran front-end for GCC (9.x.x)'
+  depends=("${pkgbase}=$pkgver-$pkgrel")
 
   cd gcc-build
   make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
@@ -237,10 +235,10 @@
   make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
   install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
 
-  ln -s gfortran "$pkgdir/usr/bin/f95"
+  ln -s gfortran-${_majorver} "$pkgdir/usr/bin/f95-${_majorver}"
 
   # Install Runtime Library Exception
   install -d "$pkgdir/usr/share/licenses/$pkgname/"
-  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+  ln -s /usr/share/licenses/${pkgbase}-libs/RUNTIME.LIBRARY.EXCEPTION \
     "$pkgdir/usr/share/licenses/$pkgname/"
 }