commit 225e8779827d2ed6fdafa16c19b957e3644347fc parent 9efeb2915585739f62b38c1f86a128a9fb36b403 Author: Hannu Nyman <hannu.nyman@iki.fi> Date: Mon, 23 Jan 2017 09:25:52 +0200 Merge pull request #3895 from psidhu/fix-ncurses6-gpsd-3.16 utils/gpsd: refresh 0002-ncurses6_detection to 3.16 Diffstat:
| M | utils/gpsd/patches/0002-ncurses6_detection.patch | | | 12 | +++++++----- |
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/utils/gpsd/patches/0002-ncurses6_detection.patch b/utils/gpsd/patches/0002-ncurses6_detection.patch @@ -1,9 +1,11 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -541,6 +541,10 @@ else: - if env['ncurses']: - if config.CheckPKG('ncurses'): +Index: gpsd-3.16/SConstruct +=================================================================== +--- gpsd-3.16.orig/SConstruct ++++ gpsd-3.16/SConstruct +@@ -543,6 +543,10 @@ else: ncurseslibs = pkg_config('ncurses') + if config.CheckPKG('tinfo'): + ncurseslibs += pkg_config('tinfo') + elif WhereIs('ncurses6-config'): + ncurseslibs = ['!ncurses6-config --libs --cflags'] + elif WhereIs('ncursesw6-config'):