summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-05-09 14:46:44 -0400
committerMike Frysinger <vapier@gentoo.org>2016-05-09 15:11:41 -0400
commitc2cf742e78552ea27ee8a22fff25063ec26fa852 (patch)
tree87c8c45ab48844fc3723960cb9a5a2adec76d7b4 /sci-geosciences/gpsd
parentapp-misc/mc: fix git repository url in mc-9999.ebuild (diff)
downloadgentoo-c2cf742e78552ea27ee8a22fff25063ec26fa852.tar.gz
gentoo-c2cf742e78552ea27ee8a22fff25063ec26fa852.tar.bz2
gentoo-c2cf742e78552ea27ee8a22fff25063ec26fa852.zip
sci-geosciences/gpsd: fix build w/newer glibc #581740
Diffstat (limited to 'sci-geosciences/gpsd')
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.16-sysmacros.patch31
-rw-r--r--sci-geosciences/gpsd/gpsd-3.15.ebuild1
-rw-r--r--sci-geosciences/gpsd/gpsd-3.16.ebuild1
3 files changed, 33 insertions, 0 deletions
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
index 000000000000..d9863c9280f5
--- /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 3505460c88a9..e6f317299729 100644
--- 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 4602b53d24f7..5928f17d0409 100644
--- 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 \