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

[Bartłomiej Piotrowski]

    Date: Tuesday, November 28, 2017 @ 21:38:11
  Author: bpiotrowski
Revision: 311128

7.2.1-2: fix issues related to multilib merge

- make lib32-gcc-libs an optional dependency of gcc
- remove conflicting libgo files from gcc-go
- restore 32-bit files for gcc-{ada,fortran,go}

Modified:
  gcc/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-28 19:19:26 UTC (rev 311127)
+++ PKGBUILD	2017-11-28 21:38:11 UTC (rev 311128)
@@ -9,7 +9,7 @@
 pkgver=7.2.1
 _pkgver=${pkgver:0:1}
 _islver=0.18
-pkgrel=1
+pkgrel=2
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
@@ -17,7 +17,7 @@
 makedepends=(binutils libmpc gcc-ada doxygen git lib32-glibc)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-_commit=aa909c285f8dc06238588cb2c045e73dc721ad9b
+_commit=bce1ab0478f96724828df51ccfd43197d917c572
 source=(git+https://gcc.gnu.org/git/gcc.git#commit=${_commit}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
         c89 c99)
@@ -130,7 +130,7 @@
   make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
   make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
   make -C $CHOST/libmpx DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libmpx.spec
+  rm -f "$pkgdir/usr/lib/libmpx.spec"
 
   for lib in libgomp \
              libitm \
@@ -148,9 +148,9 @@
 
 package_gcc() {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" "lib32-gcc-libs=$pkgver-$pkgrel"
-           'binutils>=2.28' libmpc)
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
   groups=('base-devel')
+  optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
   provides=($pkgname-multilib)
   replaces=($pkgname-multilib)
   options+=(staticlibs)
@@ -241,6 +241,8 @@
   cd gcc-build
   make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
     install-{toolexeclibDATA,nodist_fincludeHEADERS}
+  make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
+    install-{toolexeclibDATA,nodist_fincludeHEADERS}
   make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
   make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
   install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
@@ -281,6 +283,10 @@
   make DESTDIR="$pkgdir" ada.install-{common,info}
   install -m755 gnat1 "$pkgdir/${_libdir}"
 
+  cd "$srcdir"/gcc-build/$CHOST/32/libada
+  make DESTDIR=${pkgdir} INSTALL="install" \
+    INSTALL_DATA="install -m644" install-gnatlib
+
   ln -s gcc "$pkgdir/usr/bin/gnatgcc"
 
   # insist on dynamic linking, but keep static libraries because gnatmake complains
@@ -289,6 +295,12 @@
   ln -s libgnat-${_pkgver}.so "$pkgdir/usr/lib/libgnat.so"
   rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
 
+  install -d "$pkgdir/usr/lib32/"
+  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_pkgver}.so "$pkgdir/usr/lib32"
+  ln -s libgnarl-${_pkgver}.so "$pkgdir/usr/lib32/libgnarl.so"
+  ln -s libgnat-${_pkgver}.so "$pkgdir/usr/lib32/libgnat.so"
+  rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
+
   # Install Runtime Library Exception
   install -d "$pkgdir/usr/share/licenses/$pkgname/"
   ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
@@ -304,10 +316,11 @@
 
   cd gcc-build
   make -C $CHOST/libgo DESTDIR="$pkgdir" install-exec-am
+  make -C $CHOST/32/libgo DESTDIR="$pkgdir" install-exec-am
   make DESTDIR="$pkgdir" install-gotools
   make -C gcc DESTDIR="$pkgdir" go.install-{common,man,info}
 
-  rm -f "$pkgdir"/usr/lib/libgo.so*
+  rm -f "$pkgdir"/usr/lib{,32}/libgo.so*
   install -Dm755 gcc/go1 "$pkgdir/${_libdir}/go1"
 
   # Install Runtime Library Exception
@@ -319,12 +332,13 @@
 package_lib32-gcc-libs() {
   pkgdesc='32-bit runtime libraries shipped by GCC'
   depends=('lib32-glibc>=2.26')
+  groups=(multilib-devel)
   options=(!emptydirs !strip)
 
-  cd ${srcdir}/gcc-build
+  cd gcc-build
 
   make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install-shared
-  rm "$pkgdir/$_libdir/32/libgcc_eh.a"
+  rm -f "$pkgdir/$_libdir/32/libgcc_eh.a"
 
   for lib in libatomic \
              libcilkrts \
@@ -341,10 +355,10 @@
 
   make -C $CHOST/32/libobjc DESTDIR="$pkgdir" install-libs
   make -C $CHOST/32/libmpx DESTDIR="$pkgdir" install
-  rm "$pkgdir/usr/lib32/libmpx.spec"
+  rm -f "$pkgdir/usr/lib32/libmpx.spec"
 
   # remove files provided by gcc-libs
-  rm -r "$pkgdir"/usr/lib
+  rm -rf "$pkgdir"/usr/lib
 
   # Install Runtime Library Exception
   install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \