diff options
Diffstat (limited to 'package/gpsd')
| -rw-r--r-- | package/gpsd/Config.in | 44 | ||||
| -rw-r--r-- | package/gpsd/Makefile | 26 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-contrib_binlog_c | 11 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-contrib_motosend_c | 29 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-driver_garmin_txt_c | 20 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-driver_sirf_c | 11 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-gpspipe_c | 11 | ||||
| -rw-r--r-- | package/gpsd/patches/patch-hex_c | 11 |
8 files changed, 11 insertions, 152 deletions
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in deleted file mode 100644 index f0c274449..000000000 --- a/package/gpsd/Config.in +++ /dev/null @@ -1,44 +0,0 @@ -config ADK_PACKAGE_GPSD - prompt "gpsd.............................. An interface daemon for GPS receivers" - tristate - default n - depends on ADK_CXX - select ADK_PACKAGE_LIBPTHREAD - help - gpsd is a monitor daemon that watches a TCP/IP port (2947 by default), - waiting for applications to request information from GPSes or - differential-GPS radios attached to the host machine. Each GPS or - radio is expected to be direct-connected to the host via a USB or - RS232C serial port. The port may be specified to gpsd at startup, or - it may be set via a command shipped down a local control socket (e.g. - by a USB hotplug script). Given a GPS device by either means, gpsd - discovers the correct port speed and protocol for it. - - http://gpsd.berlios.de/ - -config ADK_PACKAGE_GPSD_CLIENTS - prompt "gpsd-clients.................... cgps and gpxlogger" - tristate - default y - depends on ADK_PACKAGE_GPSD - help - This enables the command-line GPS client "cgps" and - the "gpxlogger" tool for outputting standard GPX files. - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_GPSD -default ADK_COMPILE_GPSD_WITH_STDCXX if ADK_TARGET_LIB_GLIBC -default ADK_COMPILE_GPSD_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_GPSD_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_GPSD_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index ced495739..915c165b2 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -4,49 +4,45 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd -PKG_VERSION:= 2.39 +PKG_VERSION:= 2.92 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3db437196a6840c252fca99b6c19d4d0 +PKG_MD5SUM:= 50b60d9f6dd51e001f4dfbaeb825c988 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= net PKG_DEPENDS:= libpthread +PKG_BUILDDEP+= ncurses +PKG_CXX:= GPSD PKG_SITES:= http://download.berlios.de/gpsd/ +PKG_URL:= http://gpsd.berlios.de/ PKG_DESCR_1:= GPS client utilities include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= EGREP="grep -E" \ CPP="$(TARGET_CC) -E" \ + PYTHON="none" \ ac_cv_func_strlcpy=no \ ac_cv_func_strlcat=no \ ac_cv_lib_nsl_gethostbyname=no -# --disable-python breaks configure script CONFIGURE_ARGS+= --without-x \ --disable-dbus -BUILD_STYLE= auto -INSTALL_STYLE= auto + +TCFLAGS+= -fPIC ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++ \ -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -luClibc++ -lc -lm -nodefaultlibs +TLDFLAGS+= -luClibc++ -lc -lm -pthread -nodefaultlibs else -TLDFLAGS+= -shared +TLDFLAGS+= -shared -pthread endif post-extract: - @find ${WRKBUILD} -name *.rej -delete + @find ${WRKBUILD} -name *.rej -exec rm {} \; ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ diff --git a/package/gpsd/patches/patch-contrib_binlog_c b/package/gpsd/patches/patch-contrib_binlog_c deleted file mode 100644 index 99b20bf47..000000000 --- a/package/gpsd/patches/patch-contrib_binlog_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.39.orig/contrib/binlog.c 2009-01-28 21:53:46.000000000 +0100 -+++ gpsd-2.39/contrib/binlog.c 2009-06-13 09:13:00.000000000 +0200 -@@ -58,7 +58,7 @@ int main(int argc, char **argv) { - if (l > 0) - write(ofd, buf, l); - usleep(1000); -- bzero(buf, BUFSIZ); -+ memset(buf, 0, BUFSIZ); - spinner( n++ ); - } - return 0; diff --git a/package/gpsd/patches/patch-contrib_motosend_c b/package/gpsd/patches/patch-contrib_motosend_c deleted file mode 100644 index c5f1b0162..000000000 --- a/package/gpsd/patches/patch-contrib_motosend_c +++ /dev/null @@ -1,29 +0,0 @@ ---- gpsd-2.39.orig/contrib/motosend.c 2008-06-26 21:08:36.000000000 +0200 -+++ gpsd-2.39/contrib/motosend.c 2009-06-13 09:12:46.000000000 +0200 -@@ -81,7 +81,7 @@ int main(int argc, char **argv) { - t = 0; n = 0; - while (1){ - usleep(1000); -- bzero(buf, BSIZ); -+ memset(buf, 0, BSIZ); - if ((l = read(fd, buf, BSIZ)) == -1) - if (!(EINTR == errno || EAGAIN == errno)) - err(1, "read"); -@@ -119,7 +119,7 @@ static int moto_send(int fd, char *type, - if ((buf = malloc(l+7)) == NULL) - return -1; - -- bzero(buf, l+7); -+ memset(buf, 0, l+7); - buf[0] = '@'; buf[1] = '@'; - buf[2] = type[0]; buf[3] = type[1]; - -@@ -171,7 +171,7 @@ int gpsd_hexpack(char *src, char *dst, i - if ((l < 1) || (l > len)) - return -1; - -- bzero(dst, len); -+ memset(dst, 0, len); - for (i = 0; i < l; i++) - if ((k = hex2bin(src+i*2)) != -1) - dst[i] = (char)(k & 0xff); diff --git a/package/gpsd/patches/patch-driver_garmin_txt_c b/package/gpsd/patches/patch-driver_garmin_txt_c deleted file mode 100644 index 604e103b0..000000000 --- a/package/gpsd/patches/patch-driver_garmin_txt_c +++ /dev/null @@ -1,20 +0,0 @@ ---- gpsd-2.39.orig/driver_garmin_txt.c 2009-03-03 12:39:57.000000000 +0100 -+++ gpsd-2.39/driver_garmin_txt.c 2009-06-13 09:13:23.000000000 +0200 -@@ -167,7 +167,7 @@ static int gar_decode(const char *data, - return -1; - } - -- bzero(buf, (int)sizeof(buf)); -+ memset(buf, 0, (int)sizeof(buf)); - (void) strncpy(buf, data, length); - gpsd_report(LOG_RAW, "Decoded string: %s\n", buf); - -@@ -230,7 +230,7 @@ static int gar_int_decode(const char *da - return -1; - } - -- bzero(buf, (int)sizeof(buf)); -+ memset(buf, 0, (int)sizeof(buf)); - (void) strncpy(buf, data, length); - gpsd_report(LOG_RAW, "Decoded string: %s\n", buf); - diff --git a/package/gpsd/patches/patch-driver_sirf_c b/package/gpsd/patches/patch-driver_sirf_c deleted file mode 100644 index 1e44cee91..000000000 --- a/package/gpsd/patches/patch-driver_sirf_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.39.orig/driver_sirf.c 2009-03-07 16:30:58.000000000 +0100 -+++ gpsd-2.39/driver_sirf.c 2009-06-13 09:13:42.000000000 +0200 -@@ -238,7 +238,7 @@ static gps_mask_t sirf_msg_debug(unsigne - char msgbuf[MAX_PACKET_LENGTH*3 + 2]; - int i; - -- bzero(msgbuf, (int)sizeof(msgbuf)); -+ memset(msgbuf, 0, (int)sizeof(msgbuf)); - - /*@ +charint @*/ - if (0xe1 == buf[0]) { /* Development statistics messages */ diff --git a/package/gpsd/patches/patch-gpspipe_c b/package/gpsd/patches/patch-gpspipe_c deleted file mode 100644 index d840a2a36..000000000 --- a/package/gpsd/patches/patch-gpspipe_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.39.orig/gpspipe.c 2009-03-03 00:22:49.000000000 +0100 -+++ gpsd-2.39/gpspipe.c 2009-06-13 09:14:14.000000000 +0200 -@@ -108,7 +108,7 @@ static void open_serial(char* device) - } - - /* Clear struct for new port settings. */ -- /*@i@*/bzero(&newtio, sizeof(newtio)); -+ /*@i@*/memset(&newtio, 0, sizeof(newtio)); - - /* make it raw */ - (void)cfmakeraw(&newtio); diff --git a/package/gpsd/patches/patch-hex_c b/package/gpsd/patches/patch-hex_c deleted file mode 100644 index ebb2e1697..000000000 --- a/package/gpsd/patches/patch-hex_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.39.orig/hex.c 2009-03-18 18:37:56.000000000 +0100 -+++ gpsd-2.39/hex.c 2009-06-13 09:13:58.000000000 +0200 -@@ -61,7 +61,7 @@ int gpsd_hexpack(char *src, char *dst, s - if ((l < 1) || ((size_t)l > len)) - return -2; - -- bzero(dst, (int)len); -+ memset(dst, 0, (int)len); - for (i = 0; i < l; i++) - if ((k = hex2bin(src+i*2)) != -1) - dst[i] = (char)(k & 0xff); |