summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-11-13 12:20:59 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-11-13 12:21:03 +0100
commit42c2de22ccda9a18478bcce4d8bf57c8b6f4a6cb (patch)
tree2bdc4ebc335ed6f55c94edfc467802de84bf9e65
parent21615f5103fb3f22c5fec50fc1fb469d0e12109d (diff)
downloadptxdist-42c2de22ccda9a18478bcce4d8bf57c8b6f4a6cb.tar.gz
ptxdist-42c2de22ccda9a18478bcce4d8bf57c8b6f4a6cb.tar.xz
gpsd: don't use libnsl
It's not needed on Linux so don't try to use it. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch30
-rw-r--r--patches/gpsd-3.21/series3
-rw-r--r--rules/gpsd.in1
3 files changed, 32 insertions, 2 deletions
diff --git a/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch b/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch
new file mode 100644
index 000000000..e857f8faa
--- /dev/null
+++ b/patches/gpsd-3.21/0004-SConstruct-don-t-use-lnsl.patch
@@ -0,0 +1,30 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 13 Nov 2020 11:55:47 +0100
+Subject: [PATCH] SConstruct: don't use -lnsl
+
+It may be found on Linux but is not actually needed.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ SConstruct | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index d303c3aa6d20..ce627e93f65e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1113,13 +1113,7 @@ else:
+ else:
+ confdefs.append("/* #undef HAVE_LIBRT */\n")
+
+- # for slowlaris socket(), bind(), etc.
+- if config.CheckLib('libnsl'):
+- confdefs.append("#define HAVE_LIBNSL\n")
+- # System library - no special flags
+- rtlibs += ["-lnsl"]
+- else:
+- confdefs.append("/* #undef HAVE_LIBNSL */\n")
++ confdefs.append("/* #undef HAVE_LIBNSL */\n")
+
+ # for slowlaris socket(), bind(), etc.
+ if config.CheckLib('libsocket'):
diff --git a/patches/gpsd-3.21/series b/patches/gpsd-3.21/series
index 59c905551..bbfb1be7d 100644
--- a/patches/gpsd-3.21/series
+++ b/patches/gpsd-3.21/series
@@ -3,4 +3,5 @@
0001-Search-for-ncursesw-pkgconfig.patch
0002-SConstruct-Use-target-option-to-decide-whenewer-to-r.patch
0003-SConstruct-don-t-make-python-files-without-shebang-e.patch
-# ac113373083222a9a340e9ddf30a7fd2 - git-ptx-patches magic
+0004-SConstruct-don-t-use-lnsl.patch
+# a4f439aa9ecaa21523935c6cada0b0dc - git-ptx-patches magic
diff --git a/rules/gpsd.in b/rules/gpsd.in
index a86cb0635..a203e48d4 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -3,7 +3,6 @@ menuconfig GPSD
tristate
select HOST_PYTHON3_SCONS
select LIBC_M
- select LIBC_NSL
select LIBC_PTHREAD
select GCCLIBS_CXX
select GCCLIBS_GCC_S