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

[Sven-Hendrik Haase]

    Date: Sunday, June 23, 2019 @ 05:00:11
  Author: svenstaro
Revision: 482980

upgpkg: gcc8 8.3.0-2

Get rid of conflicting files

Modified:
  gcc8/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-23 05:00:05 UTC (rev 482979)
+++ PKGBUILD	2019-06-23 05:00:11 UTC (rev 482980)
@@ -10,7 +10,7 @@
 _pkgver=8
 _majorver=${pkgver:0:1}
 _islver=0.21
-pkgrel=1
+pkgrel=2
 pkgdesc='The GNU Compiler Collection (8.x.x)'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
@@ -132,6 +132,8 @@
 
   cd gcc-build
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
+  mv "$pkgdir"/$_libdir/../lib/* "$pkgdir"/$_libdir
+  rmdir "$pkgdir"/$_libdir/../lib
   rm -f "$pkgdir/$_libdir/libgcc_eh.a"
 
   for lib in libatomic \
@@ -146,7 +148,7 @@
   done
 
   make -C $CHOST/libmpx DESTDIR="$pkgdir" install
-  rm -f "$pkgdir/usr/lib/libmpx.spec"
+  rm -f "$pkgdir/${_libdir}/libmpx.spec"
 
   # Install Runtime Library Exception
   install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
@@ -166,12 +168,13 @@
   install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1,gcov,gcov-tool}
 
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install
-  rm -f "$pkgdir"/usr/lib/libgcc_s.so*
+  rm -r "$pkgdir"/${_libdir}/../lib
 
   make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/python DESTDIR="$pkgdir" install
+  rm "$pkgdir"/${_libdir}/libstdc++*
 
   make DESTDIR="$pkgdir" install-fixincludes
   make -C gcc DESTDIR="$pkgdir" install-mkheaders
@@ -202,7 +205,7 @@
     "$pkgdir/usr/share/licenses/$pkgname/"
 
   # Remove conflicting files
-  rm -rf "$pkgdir"/usr/share/locale
+  rm -r "$pkgdir"/usr/share/locale
 }
 
 package_gcc8-fortran() {