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

[Levente Polyak]

    Date: Thursday, February 20, 2020 @ 22:43:55
  Author: anthraxx
Revision: 375969

overhault style and quite pkgdir's

Modified:
  gdb/trunk/PKGBUILD

----------+
 PKGBUILD |   33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-20 22:27:58 UTC (rev 375968)
+++ PKGBUILD	2020-02-20 22:43:55 UTC (rev 375969)
@@ -1,4 +1,5 @@
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgbase=gdb
@@ -13,6 +14,8 @@
 license=(GPL3)
 makedepends=(texinfo python guile2.0 ncurses expat xz source-highlight)
 source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig})
+b2sums=('b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30'
+        'SKIP')
 sha1sums=('a50e13e1eecea468ea28c4a23d8c5a84f4db25be'
           'SKIP')
 validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker
@@ -28,7 +31,9 @@
   cd gdb-$pkgver
 
   mkdir -p build && cd build
-  ../configure --prefix=/usr --disable-nls \
+  ../configure \
+    --prefix=/usr \
+    --disable-nls \
     --with-system-readline \
     --with-python=/usr/bin/python \
     --with-guile=guile-2.0 \
@@ -40,7 +45,14 @@
   depends=(python guile2.0)
 
   cd gdb-$pkgver/build
-  make -C gdb/data-directory DESTDIR=$pkgdir install
+
+  make DESTDIR="$pkgdir" install
+  # 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}
 }
 
 package_gdb() {
@@ -48,12 +60,19 @@
   backup=(etc/gdb/gdbinit)
 
   cd gdb-$pkgver/build
-  make -C gdb DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
+  # 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
+
   # install "custom" system gdbinit
-  install -dm755 $pkgdir/etc/gdb
-  touch $pkgdir/etc/gdb/gdbinit
+  install -dm 755 "$pkgdir/etc/gdb"
+  touch "$pkgdir/etc/gdb/gdbinit"
 
   # comes from gdb-common
-  rm -r $pkgdir/usr/share/gdb/
+  rm -r "$pkgdir/usr/share/gdb/"
 }
+
+# vim: ts=2 sw=2 et: