aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-09 20:24:27 +0300
committerKhem Raj <raj.khem@gmail.com>2019-07-10 09:28:20 -0700
commit517f7ba99ce9437ece3487f14aefa2d416cfb0a3 (patch)
tree7dfeeb6b32a7a39894da2f3085104f18477f9578
parent499f1b4e24d68c4a96bc2d9f9deebad825874da5 (diff)
downloadmeta-openembedded-contrib-517f7ba99ce9437ece3487f14aefa2d416cfb0a3.tar.gz
meta-openembedded-contrib-517f7ba99ce9437ece3487f14aefa2d416cfb0a3.tar.bz2
meta-openembedded-contrib-517f7ba99ce9437ece3487f14aefa2d416cfb0a3.zip
gpsd: Remove obsolete musl patch
Upstream fixed this differently 4 years ago. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch35
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb1
2 files changed, 0 insertions, 36 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch
deleted file mode 100644
index e91e4e9fbd..0000000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f221fa959c80b43c65426500a6836a1b5cf6fe0c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 17 Aug 2016 02:16:12 +0000
-Subject: [PATCH] include sys/ttydefaults.h
-
-This is needed for CTRL definition, as exposed by musl on glibc
-this include file gets pulled indirectly.
-
-/usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL'
-clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation)
-scons: *** [gpsmon] Error 1
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Foreward port to gpsd 3.16
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- gpsmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gpsmon.c b/gpsmon.c
-index 89c43ee2..5cc0dabd 100644
---- a/gpsmon.c
-+++ b/gpsmon.c
-@@ -24,6 +24,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/select.h>
-+#include <sys/ttydefaults.h>
- #include <fcntl.h>
- #include <unistd.h>
-
---
-2.12.0
-
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb
index 22097e3aa4..5730f3da28 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb
@@ -13,7 +13,6 @@ EXTRANATIVEPATH += "chrpath-native"
SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
- file://0002-include-sys-ttydefaults.h.patch \
file://0003-SConstruct-disable-html-and-man-docs-building-becaus.patch \
"
SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5"