sci-geosciences/gpsd: fix build w/newer glibc #581740

diff --git a/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch b/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch
new file mode 100644 (file)
index 0000000..d9863c9
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/581740
+
+From 87027243d101cfa7e01d9b697f890ea7b247449b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 9 May 2016 14:33:06 -0400
+Subject: [PATCH] include sys/sysmacros.h for major
+
+These functions are not part of any official spec, and Linux C libs have
+always kept them in sys/sysmacros.h.  Include the header directly to fix
+builds w/alternative C libs, and to work with future glibc versions.
+---
+ serial.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/serial.c b/serial.c
+index d8bdd8c..b748cab 100644
+--- a/serial.c
++++ b/serial.c
+@@ -14,6 +14,9 @@
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/param.h>        /* defines BSD */
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
+ 
+ #include "gpsd_config.h"
+ #ifdef ENABLE_BLUEZ
+-- 
+2.7.4
+

diff --git a/sci-geosciences/gpsd/gpsd-3.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
index 3505460c88a99869e0d72f48584cb69ae26c7a73..e6f317299729570566f7cdb0978bdd9c284f9723 100644 (file)
--- a/sci-geosciences/gpsd/gpsd-3.15.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
        epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
        epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+       epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
 
        # Avoid useless -L paths to the install dir
        sed -i \

diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 4602b53d24f7b5c32a229e04ff175cf48bbb4ef9..5928f17d0409b5a7ee137fa86e0c8bc07d92c074 100644 (file)
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
        epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
        epatch "${FILESDIR}"/${PN}-3.15-broken-install.patch
+       epatch "${FILESDIR}"/${PN}-3.16-sysmacros.patch #581740
 
        # Avoid useless -L paths to the install dir
        sed -i \