diff options
Diffstat (limited to 'package/gpsd')
| -rw-r--r-- | package/gpsd/Makefile | 6 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-SConstruct | 12 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-gpsmon_c | 13 |
3 files changed, 3 insertions, 28 deletions
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index b0523f5d9..5aeee6b67 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gpsd -PKG_VERSION:= 3.16 +PKG_VERSION:= 3.24 PKG_RELEASE:= 1 -PKG_HASH:= 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 +PKG_HASH:= 00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c PKG_DESCR:= interface daemon for gps receivers PKG_SECTION:= sys/hw PKG_BUILDDEP:= scons-host ncurses @@ -31,7 +31,7 @@ INSTALL_STYLE:= manual do-install: (cd $(WRKBUILD); env PATH='$(TARGET_PATH)' CCFLAGS='' DESTDIR='$(WRKINST)' \ - scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no) + $(STAGING_HOST_DIR)/usr/bin/python3 $(STAGING_HOST_DIR)/usr/bin/scons install prefix=/usr platform=linux python=no chrpath=no bluez=no usb=no libgpsmm=no) gpsd-install: ${INSTALL_DIR} ${IDIR_GPSD}/usr/lib ${IDIR_GPSD}/usr/sbin diff --git a/package/gpsd/patches/patch-SConstruct b/package/gpsd/patches/patch-SConstruct deleted file mode 100644 index 0937d9f67..000000000 --- a/package/gpsd/patches/patch-SConstruct +++ /dev/null @@ -1,12 +0,0 @@ ---- gpsd-3.10.orig/SConstruct 2013-11-22 14:10:01.000000000 +0100 -+++ gpsd-3.10/SConstruct 2014-02-07 19:33:32.000000000 +0100 -@@ -231,6 +231,9 @@ for (name, default, help) in pathopts: - - env['VERSION'] = gpsd_version - env['PYTHON'] = sys.executable -+env['PLATFORM'] = "posix" -+env['SHLIBSUFFIX'] = ".so" -+env['SHLINKFLAGS'] = "-shared" - - # Set defaults from environment. Note that scons doesn't cope well - # with multi-word CPPFLAGS/LDFLAGS/SHLINKFLAGS values; you'll have to diff --git a/package/gpsd/patches/patch-gpsmon_c b/package/gpsd/patches/patch-gpsmon_c deleted file mode 100644 index ac52866d0..000000000 --- a/package/gpsd/patches/patch-gpsmon_c +++ /dev/null @@ -1,13 +0,0 @@ ---- gpsd-3.10.orig/gpsmon.c 2013-11-21 09:57:44.000000000 +0100 -+++ gpsd-3.10/gpsmon.c 2014-03-16 09:08:34.000000000 +0100 -@@ -505,6 +505,10 @@ static /*@null@*/ char *curses_get_comma - static char line[80]; - int c; - -+#ifndef __GLIBC__ -+#define CTRL(x) (x&037) -+#endif -+ - c = wgetch(cmdwin); - if (c == CTRL('L')) { - (void)clearok(stdscr, true); |