Subject: [alpine-aports] [PATCH] main/gdb: upgrade to 7.11

From: Sören Tempel <[email-masked]>
Date: Mon, 29 Feb 2016 03:44:35 +0100

---
 main/gdb/APKBUILD            | 30 +++++++++++-------------------
 main/gdb/gdb-linux_nat.patch | 26 --------------------------
 2 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 100644 main/gdb/gdb-linux_nat.patch

diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index 93a7df5..ec4a73c 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -1,26 +1,18 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=gdb
-pkgver=7.10.1
-pkgrel=2
+pkgver=7.11
+pkgrel=0
 pkgdesc="The GNU Debugger"
 url="http://sources.redhat.com/gdb/"
 arch="all"
 license="GPL3"
 depends=
-makedepends="ncurses-dev expat-dev texinfo readline-dev python-dev
-	autoconf automake libtool linux-headers"
+makedepends="ncurses-dev expat-dev texinfo zlib-dev readline-dev
+	python-dev autoconf automake libtool linux-headers"
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
-	gdb-linux_nat.patch
 	"
-#	05_all_readline-headers.patch
-#	cpuid-pic.patch
-#	gdb-linux_nat.patch
-#	gdb-linux_osdata.patch
-#	gdb-linux_threaddb.patch
-#	gdb-amd64-debugreg.patch
-# patches were found here:
-# http://distfiles.gentoo.org/distfiles/gdb-7.4-patches-1.tar.xz
+
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
@@ -50,6 +42,9 @@ build () {
 	# use system readline if not cross compiling
 	[ "$CBUILD" = "$CHOST" ] && _config="$_config --with-system-readline"
 
+	# use system zlib if not cross compiling
+	[ "$CBUILD" = "$CHOST" ] && _config="$_config --with-system-zlib"
+
 	# gdb server does not compile with musl
 	[ "$CTARGET_LIBC" = musl ] &&  _config="$_config --disable-gdbserver"
 
@@ -71,9 +66,6 @@ package() {
 	rm -rf "$pkgdir"/usr/lib
 }
 
-md5sums="39e654460c9cdd80200a29ac020cfe11  gdb-7.10.1.tar.xz
-4e9d84600ca314ab4db8baf8f8ffe297  gdb-linux_nat.patch"
-sha256sums="25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5  gdb-7.10.1.tar.xz
-dcef02741f402ad34c658a90b85667e93e1d3293fe2941acd5b6821b349a1532  gdb-linux_nat.patch"
-sha512sums="17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010  gdb-7.10.1.tar.xz
-1d5ecce8c1b597f12298d17bae308e332cb0dbae56b08c3da7829ab6a473f1b20e8e6572bab45bce5942771753604b7a9541c809f2a86d4beb38ff98b0be4bfe  gdb-linux_nat.patch"
+md5sums="b5c784685e1cde65ba135feea86b6d75  gdb-7.11.tar.xz"
+sha256sums="7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1  gdb-7.11.tar.xz"
+sha512sums="eadd2a59a1e48b1484eb2bea85256d6b1912926bc8b690793d02babf2639608bd22a0f2de77d4f60092da3b1dafeaa6d75a7cff3e84bd4e22fc46364b68e5e9f  gdb-7.11.tar.xz"
diff --git a/main/gdb/gdb-linux_nat.patch b/main/gdb/gdb-linux_nat.patch
deleted file mode 100644
index 6a7276c..0000000
--- a/main/gdb/gdb-linux_nat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./gdb/linux-nat.c.orig
-+++ ./gdb/linux-nat.c
-@@ -169,6 +169,10 @@
- #define O_LARGEFILE 0
- #endif
- 
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
- /* The single-threaded native GNU/Linux target_ops.  We save a pointer for
-    the use of the multi-threaded target.  */
- static struct target_ops *linux_ops;
-@@ -4875,10 +4879,10 @@
-      fortunately they don't change!  */
- 
-   if (restart == 0)
--    restart = __SIGRTMIN;
-+    restart = SIGRTMIN;
- 
-   if (cancel == 0)
--    cancel = __SIGRTMIN + 1;
-+    cancel = SIGRTMIN + 1;
- 
-   sigaddset (set, restart);
-   sigaddset (set, cancel);
-- 
2.7.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---