diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-07-09 20:24:27 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:28:20 -0700 |
commit | 517f7ba99ce9437ece3487f14aefa2d416cfb0a3 (patch) | |
tree | 7dfeeb6b32a7a39894da2f3085104f18477f9578 | |
parent | 499f1b4e24d68c4a96bc2d9f9deebad825874da5 (diff) | |
download | meta-openembedded-517f7ba99ce9437ece3487f14aefa2d416cfb0a3.tar.gz |
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.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb | 1 |
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 @@ | |||
1 | From f221fa959c80b43c65426500a6836a1b5cf6fe0c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 17 Aug 2016 02:16:12 +0000 | ||
4 | Subject: [PATCH] include sys/ttydefaults.h | ||
5 | |||
6 | This is needed for CTRL definition, as exposed by musl on glibc | ||
7 | this include file gets pulled indirectly. | ||
8 | |||
9 | /usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL' | ||
10 | clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation) | ||
11 | scons: *** [gpsmon] Error 1 | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | Foreward port to gpsd 3.16 | ||
16 | Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | ||
17 | --- | ||
18 | gpsmon.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/gpsmon.c b/gpsmon.c | ||
22 | index 89c43ee2..5cc0dabd 100644 | ||
23 | --- a/gpsmon.c | ||
24 | +++ b/gpsmon.c | ||
25 | @@ -24,6 +24,7 @@ | ||
26 | #include <sys/types.h> | ||
27 | #include <sys/stat.h> | ||
28 | #include <sys/select.h> | ||
29 | +#include <sys/ttydefaults.h> | ||
30 | #include <fcntl.h> | ||
31 | #include <unistd.h> | ||
32 | |||
33 | -- | ||
34 | 2.12.0 | ||
35 | |||
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" | |||
13 | 13 | ||
14 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | 14 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ |
15 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ | 15 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ |
16 | file://0002-include-sys-ttydefaults.h.patch \ | ||
17 | file://0003-SConstruct-disable-html-and-man-docs-building-becaus.patch \ | 16 | file://0003-SConstruct-disable-html-and-man-docs-building-becaus.patch \ |
18 | " | 17 | " |
19 | SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" | 18 | SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" |