gpsd: fix ncurses detection, build clients

This commit is contained in:
Andrew J. Hesford 2022-02-26 22:36:08 -05:00
parent 9dfecf6c88
commit 682a710db3
2 changed files with 21 additions and 1 deletions

View file

@ -0,0 +1,20 @@
Upstream supports ncursesw but doesn't properly detect it. Let's do things the
right way and allow optional clients to be built.
https://gitlab.com/gpsd/gpsd/-/merge_requests/295
diff --git a/SConscript b/SConscript
index 345ead71550069f8fe976fab3f529f56b9e59e2b..e9c22358e0834404b1f1cfbbb1a0fca3ff58b658 100644
--- a/SConscript
+++ b/SConscript
@@ -1023,6 +1023,10 @@ if not cleaning and not helping:
ncurseslibs = pkg_config('ncurses', rpath_hack=True)
if config.CheckPKG('tinfo'):
ncurseslibs += pkg_config('tinfo', rpath_hack=True)
+ elif config.CheckPKG('ncursesw'):
+ ncurseslibs = pkg_config('ncursesw', rpath_hack=True)
+ if config.CheckPKG('tinfo'):
+ ncurseslibs += pkg_config('tinfo', rpath_hack=True)
# It's not yet known whether rpath_hack is appropriate for
# ncurses5-config.
elif WhereIs('ncurses5-config'):

View file

@ -1,7 +1,7 @@
# Template file for 'gpsd'
pkgname=gpsd
version=3.23.1
revision=3
revision=4
build_style=scons
make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin
udevdir=/usr/lib/udev CC=${CC} qt_versioned=5"