Merge pull request #3888 from RussellSenior/fix-gpsd-ncurses-detection

gpsd: add ncurses6 support
2017-01-23 08:45:39 +02:00 · 2017-01-23 08:45:39 +02:00 · 9efeb29155
parent d37694d7a5 418d5390b9
commit 9efeb29155
1 changed files with 13 additions and 0 deletions
--- a/utils/gpsd/patches/0002-ncurses6_detection.patch
+++ b/utils/gpsd/patches/0002-ncurses6_detection.patch
@ -0,0 +1,13 @@
+--- a/SConstruct
+++ b/SConstruct
+@@ -541,6 +541,10 @@ else:
+     if env['ncurses']:
+         if config.CheckPKG('ncurses'):
+             ncurseslibs = pkg_config('ncurses')
+        elif WhereIs('ncurses6-config'):
+            ncurseslibs = ['!ncurses6-config --libs --cflags']
+        elif WhereIs('ncursesw6-config'):
+            ncurseslibs = ['!ncursesw6-config --libs --cflags']
+         elif WhereIs('ncurses5-config'):
+             ncurseslibs = ['!ncurses5-config --libs --cflags']
+         elif WhereIs('ncursesw5-config'):