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

[Anatol Pomozov]

    Date: Wednesday, September 5, 2018 @ 18:16:42
  Author: anatolik
Revision: 333521

upgpkg: gdb 8.2-2

Modified:
  gdb/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-05 18:07:01 UTC (rev 333520)
+++ PKGBUILD	2018-09-05 18:16:42 UTC (rev 333521)
@@ -7,7 +7,7 @@
 # of gdb (for arm/avr/...)
 pkgname=(gdb gdb-common)
 pkgver=8.2
-pkgrel=1
+pkgrel=2
 pkgdesc='The GNU Debugger'
 arch=(x86_64)
 url='http://www.gnu.org/software/gdb/'
@@ -41,12 +41,8 @@
 
   cd gdb-$pkgver
   make DESTDIR=$pkgdir install
+  make -C bfd DESTDIR=$pkgdir uninstall # conflicts with binutils
 
-  # resolve conflicts with binutils
-  rm $pkgdir/usr/include/{ansidecl,bfd,bfdlink,dis-asm,plugin-api,symcat}.h
-  rm $pkgdir/usr/share/info/bfd.info
-  rm $pkgdir/usr/lib/{libbfd,libopcodes}.a
-
   rm -r $pkgdir/usr/{bin,include,lib,share/info,share/man}
 }
 
@@ -56,16 +52,12 @@
 
   cd gdb-$pkgver
   make DESTDIR=$pkgdir install
+  make -C bfd DESTDIR=$pkgdir uninstall # conflicts with binutils
 
   # install "custom" system gdbinit
   install -dm755 $pkgdir/etc/gdb
   touch $pkgdir/etc/gdb/gdbinit
 
-  # resolve conflicts with binutils
-  rm $pkgdir/usr/include/{ansidecl,bfd,bfdlink,dis-asm,plugin-api,symcat}.h
-  rm $pkgdir/usr/share/info/bfd.info
-  rm $pkgdir/usr/lib/{libbfd,libopcodes}.a
-
   # comes from gdb-common
   rm -r $pkgdir/usr/share/gdb/
 }