From 99ffeabcfc11ffb44d32583fc3d7db37f2fff9fd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 12 Nov 2013 09:30:49 +0100 Subject: update gpsd --- package/gpsd/Makefile | 52 ++++++++------------------------ package/gpsd/patches/patch-Makefile_in | 22 -------------- package/gpsd/patches/patch-driver_sirf_c | 11 ------- package/gpsd/patches/patch-gpspipe_c | 11 ------- package/gpsd/patches/patch-ltmain_sh | 20 ------------ package/scons/Makefile | 29 ++++++++++++++++++ 6 files changed, 41 insertions(+), 104 deletions(-) delete mode 100644 package/gpsd/patches/patch-Makefile_in delete mode 100644 package/gpsd/patches/patch-driver_sirf_c delete mode 100644 package/gpsd/patches/patch-gpspipe_c delete mode 100644 package/gpsd/patches/patch-ltmain_sh create mode 100644 package/scons/Makefile (limited to 'package') diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index bd1582060..bcebc4ac8 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -4,19 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd -PKG_VERSION:= 2.95 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 12535a9ed9fecf9ea2c5bdc9840da5ae +PKG_VERSION:= 3.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 53a88f24a0973d23427e82e9a8914f19 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= misc PKG_DEPENDS:= libpthread -PKG_BUILDDEP:= ncurses -PKG_SITES:= http://download.berlios.de/gpsd/ -PKG_URL:= http://gpsd.berlios.de/ -PKG_CXX:= GPSD -PKG_NEED_CXX:= 1 - -PKG_ARCH_DEPENDS:= !native +PKG_BUILDDEP:= ncurses scons-host python2-host +PKG_URL:= http://catb.org/gpsd/ +PKG_SITES:= http://download-mirror.savannah.gnu.org/releases/gpsd/ PKG_SUBPKGS:= GPSD GPSD_CLIENTS PKGSD_GPSD_CLIENTS:= GPS client utilities @@ -26,37 +22,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GPSD,gpsd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GPSD_CLIENTS},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -CONFIGURE_ENV+= EGREP="grep -E" \ - CPP="$(TARGET_CC) -E" \ - ac_cv_func_strlcpy=no \ - ac_cv_func_strlcat=no \ - ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --disable-dbus -TARGET_CFLAGS+= -fPIC - -ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) -LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lc -endif - -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) -LIBRARIES+=-lssp -lssp_nonshared -endif - -ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) -TARGET_CXXFLAGS+= -fno-rtti -nostdinc++ \ - -I${STAGING_TARGET_DIR}/usr/include/uClibc++ -TARGET_LDFLAGS+= $(LIBRARIES) -else -TARGET_LDFLAGS+= -shared -pthread -lstdc++ -endif +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual -ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif +do-install: + (cd $(WRKBUILD); PATH='$(TARGET_PATH)' CCFLAGS='' \ + scons install prefix=$(WRKINST)/usr 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-Makefile_in b/package/gpsd/patches/patch-Makefile_in deleted file mode 100644 index b54aabbac..000000000 --- a/package/gpsd/patches/patch-Makefile_in +++ /dev/null @@ -1,22 +0,0 @@ ---- gpsd-2.95.orig/Makefile.in 2010-07-14 00:48:24.000000000 +0200 -+++ gpsd-2.95/Makefile.in 2011-01-15 19:56:22.000000000 +0100 -@@ -612,8 +612,8 @@ libgps_la_SOURCES = $(libgps_c_sources) - libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \ - driver_rtcm2.h packet_states.h - --@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ --@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ -+@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = $(SHELL) ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ -+@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = $(SHELL) ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ - nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i - libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) - libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la -@@ -996,7 +996,7 @@ clean-libLTLIBRARIES: - rm -f "$${dir}/so_locations"; \ - done - libgps.la: $(libgps_la_OBJECTS) $(libgps_la_DEPENDENCIES) -- $(libgps_la_LINK) -rpath $(libdir) $(libgps_la_OBJECTS) $(libgps_la_LIBADD) $(LIBS) -+ $(libgps_la_LINK) -rpath $(libdir) $(libgps_la_OBJECTS) $(libgps_la_LIBADD) $(LDFLAGS) $(LIBS) - libgpsd.la: $(libgpsd_la_OBJECTS) $(libgpsd_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libgpsd_la_OBJECTS) $(libgpsd_la_LIBADD) $(LIBS) - install-binPROGRAMS: $(bin_PROGRAMS) diff --git a/package/gpsd/patches/patch-driver_sirf_c b/package/gpsd/patches/patch-driver_sirf_c deleted file mode 100644 index 058978636..000000000 --- a/package/gpsd/patches/patch-driver_sirf_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.95.orig/driver_sirf.c 2010-06-11 10:38:24.000000000 +0200 -+++ gpsd-2.95/driver_sirf.c 2010-07-30 12:53:40.000000000 +0200 -@@ -325,7 +325,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 2afd83621..000000000 --- a/package/gpsd/patches/patch-gpspipe_c +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.95.orig/gpspipe.c 2010-06-11 11:21:42.000000000 +0200 -+++ gpsd-2.95/gpspipe.c 2010-07-30 12:54:08.000000000 +0200 -@@ -120,7 +120,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-ltmain_sh b/package/gpsd/patches/patch-ltmain_sh deleted file mode 100644 index 85a07afac..000000000 --- a/package/gpsd/patches/patch-ltmain_sh +++ /dev/null @@ -1,20 +0,0 @@ ---- gpsd-2.95.orig/ltmain.sh 2010-06-18 22:54:26.000000000 +0200 -+++ gpsd-2.95/ltmain.sh 2011-01-15 20:23:12.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" -@@ -4963,7 +4963,7 @@ func_mode_link () - done - - if test "$linkmode" = lib; then -- libs="$predeps $libs $compiler_lib_search_path $postdeps" -+ libs="$libs $compiler_lib_search_path" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are diff --git a/package/scons/Makefile b/package/scons/Makefile new file mode 100644 index 000000000..97b15fc7f --- /dev/null +++ b/package/scons/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= scons +PKG_VERSION:= 2.3.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 083ce5624d6adcbdaf2526623f456ca9 +PKG_DESCR:= a software construction tool +PKG_SECTION:= lang +PKG_BUILDDEP:= python2-host +PKG_URL:= http://www.scons.org +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=scons/} + +PKG_ARCH_DEPENDS:= native + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,SCONS,scons,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= manual + +scons-hostinstall: + (cd $(WRKBUILD); PATH='$(TARGET_PATH)' python setup.py install --prefix=$(STAGING_HOST_DIR)/) + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3