Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3895 from psidhu/fix-ncurses6-gpsd-3.16

Browse source 
utils/gpsd: refresh 0002-ncurses6_detection to 3.16
This commit is contained in:
Hannu Nyman 2017-01-23 09:25:52 +02:00 committed by GitHub
commit 225e877982
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/gpsd/patches/0002-ncurses6_detection.patch
View file

@ -1,9 +1,11 @@
--- a/SConstruct Index: gpsd-3.16/SConstruct
+++ b/SConstruct ===================================================================
@@ -541,6 +541,10 @@ else: --- gpsd-3.16.orig/SConstruct
if env['ncurses']: +++ gpsd-3.16/SConstruct
if config.CheckPKG('ncurses'): @@ -543,6 +543,10 @@ else:
ncurseslibs = pkg_config('ncurses') ncurseslibs = pkg_config('ncurses')
if config.CheckPKG('tinfo'):
ncurseslibs += pkg_config('tinfo')
+ elif WhereIs('ncurses6-config'): + elif WhereIs('ncurses6-config'):
+ ncurseslibs = ['!ncurses6-config --libs --cflags'] + ncurseslibs = ['!ncurses6-config --libs --cflags']
+ elif WhereIs('ncursesw6-config'): + elif WhereIs('ncursesw6-config'):