Merge pull request #5863 from p-wassi/gpsd

utils/gpsd: update to 3.17
This commit is contained in:
Hannu Nyman 2018-04-23 16:42:40 +03:00 committed by GitHub
commit d9c5440adc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gpsd
PKG_VERSION:=3.16
PKG_VERSION:=3.17
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
PKG_HASH:=03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029
PKG_HASH:=68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a
PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
PKG_LICENSE:=BSD-3-Clause

View File

@ -2,10 +2,10 @@ 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')
@@ -672,6 +672,10 @@ else:
ncurseslibs += pkg_config('tinfo', rpath_hack=True)
# It's not yet known whether rpath_hack is appropriate for
# ncurses5-config.
+ elif WhereIs('ncurses6-config'):
+ ncurseslibs = ['!ncurses6-config --libs --cflags']
+ elif WhereIs('ncursesw6-config'):