From 5edd7d4a0d05bcdc3e5ba3402181fba588d9de62 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 30 Jul 2010 13:12:12 +0200 Subject: update and fix build on FreeBSD host --- package/gpsd/patches/patch-Makefile_in | 55 +++++++------------------------- package/gpsd/patches/patch-gps_1 | 17 ---------- package/gpsd/patches/patch-gpsd_config_h | 42 ------------------------ package/gpsd/patches/patch-gpsd_h | 42 ------------------------ package/gpsd/patches/patch-revision_h | 5 --- 5 files changed, 12 insertions(+), 149 deletions(-) delete mode 100644 package/gpsd/patches/patch-gps_1 delete mode 100644 package/gpsd/patches/patch-gpsd_config_h delete mode 100644 package/gpsd/patches/patch-gpsd_h delete mode 100644 package/gpsd/patches/patch-revision_h (limited to 'package/gpsd/patches') diff --git a/package/gpsd/patches/patch-Makefile_in b/package/gpsd/patches/patch-Makefile_in index fe57b879b..bd45358ee 100644 --- a/package/gpsd/patches/patch-Makefile_in +++ b/package/gpsd/patches/patch-Makefile_in @@ -1,44 +1,13 @@ ---- gpsd-2.92.orig/Makefile.in 2010-03-03 14:49:11.000000000 +0100 -+++ gpsd-2.92/Makefile.in 2010-04-03 10:33:48.782836143 +0200 -@@ -615,8 +615,6 @@ libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIB - # - # Build Python binding - # --@HAVE_PYTHON_TRUE@PYEXTENSIONS = gpspacket.so gpslib.so --@HAVE_PYTHON_TRUE@noinst_SCRIPTS = gpspacket.so gpslib.so setup.py - @LIBGPSMM_ENABLE_FALSE@TESTBINS = test_float test_trig test_bits test_packet test_geoid \ - @LIBGPSMM_ENABLE_FALSE@ test_mkgmtime test_json +--- gpsd-2.95.orig/Makefile.in 2010-07-14 00:48:24.000000000 +0200 ++++ gpsd-2.95/Makefile.in 2010-07-30 13:04:19.000000000 +0200 +@@ -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 -@@ -1946,32 +1944,6 @@ maskdump.c: gpsd.h-tail maskaudit.py - $(PYTHON) maskaudit.py -c >maskdump.c && \ - chmod a-w maskdump.c - --# Multiple-outputs hack. See --# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs --@HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules --@HAVE_PYTHON_TRUE@ +@WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED) --# TODO: Should the dependency on libgps.la be enforced inside --# setup.py? (See the variable 'needed_files' in setup.py.) --@HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpsclient.c libgps.la setup.py --@HAVE_PYTHON_TRUE@ @rm -f '$@' '$@.tmp' --@HAVE_PYTHON_TRUE@ @echo 'timestamp for $@' > '$@.tmp' --@HAVE_PYTHON_TRUE@ (cd '$(srcdir)' && \ --@HAVE_PYTHON_TRUE@ env abs_builddir='$(abs_builddir)' \ --@HAVE_PYTHON_TRUE@ MAKE='$(MAKE)' \ --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py build_ext \ --@HAVE_PYTHON_TRUE@ --build-lib '$(srcdir)' \ --@HAVE_PYTHON_TRUE@ --build-temp '$(srcdir)/build' \ --@HAVE_PYTHON_TRUE@ --include-dirs '$(srcdir):.'\ --@HAVE_PYTHON_TRUE@ --mangenerator '$(MANGENERATOR)') && \ --@HAVE_PYTHON_TRUE@ mv -f '$@.tmp' '$@' -- --# Clean up after Python --@HAVE_PYTHON_TRUE@clean-local: --@HAVE_PYTHON_TRUE@ rm -rf build -- --# Install Python modules --@HAVE_PYTHON_TRUE@install-exec-local: --@HAVE_PYTHON_TRUE@ $(PYTHON) setup.py install --prefix=${prefix} # --root=$(DESTDIR) - - @HAVE_XSLT_PROCESSOR_TRUE@.xml.1: - @HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $< +-@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 diff --git a/package/gpsd/patches/patch-gps_1 b/package/gpsd/patches/patch-gps_1 deleted file mode 100644 index 23b1b8763..000000000 --- a/package/gpsd/patches/patch-gps_1 +++ /dev/null @@ -1,17 +0,0 @@ ---- gpsd-2.92.orig/gps.1 2010-03-01 06:00:44.000000000 +0100 -+++ gpsd-2.92/gps.1 2010-04-03 10:22:50.111390920 +0200 -@@ -2,12 +2,12 @@ - .\" Title: gps - .\" Author: [see the "AUTHORS" section] - .\" Generator: DocBook XSL Stylesheets v1.75.1 --.\" Date: 03/01/2010 -+.\" Date: 04/03/2010 - .\" Manual: [FIXME: manual] - .\" Source: [FIXME: source] - .\" Language: English - .\" --.TH "GPS" "1" "03/01/2010" "[FIXME: source]" "[FIXME: manual]" -+.TH "GPS" "1" "04/03/2010" "[FIXME: source]" "[FIXME: manual]" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- diff --git a/package/gpsd/patches/patch-gpsd_config_h b/package/gpsd/patches/patch-gpsd_config_h deleted file mode 100644 index dbc0c7b12..000000000 --- a/package/gpsd/patches/patch-gpsd_config_h +++ /dev/null @@ -1,42 +0,0 @@ ---- gpsd-2.92.orig/gpsd_config.h 2010-03-03 01:58:01.000000000 +0100 -+++ gpsd-2.92/gpsd_config.h 2010-04-03 10:22:22.423474030 +0200 -@@ -117,7 +117,7 @@ - #define HAVE_PYTHON_H 1 - - /* Define to 1 if you have the `round' function. */ --/* #undef HAVE_ROUND */ -+#define HAVE_ROUND 1 - - /* Define to 1 if you have the `setlocale' function. */ - #define HAVE_SETLOCALE 1 -@@ -141,7 +141,7 @@ - /* #undef HAVE_STRLCPY */ - - /* Define to 1 if you have the `strtonum' function. */ --/* #undef HAVE_STRTONUM */ -+#define HAVE_STRTONUM 1 - - /* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -206,10 +206,10 @@ - #define HAVE_VSNPRINTF 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_X11_XPM_H 1 -+/* #undef HAVE_X11_XPM_H */ - - /* Xpm available */ --#define HAVE_XPM 1 -+/* #undef HAVE_XPM */ - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_XPM_H */ -@@ -309,7 +309,7 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 diff --git a/package/gpsd/patches/patch-gpsd_h b/package/gpsd/patches/patch-gpsd_h deleted file mode 100644 index 86912eac7..000000000 --- a/package/gpsd/patches/patch-gpsd_h +++ /dev/null @@ -1,42 +0,0 @@ ---- gpsd-2.92.orig/gpsd.h 2010-03-03 01:58:01.000000000 +0100 -+++ gpsd-2.92/gpsd.h 2010-04-03 10:22:22.793473137 +0200 -@@ -137,7 +137,7 @@ - #define HAVE_PYTHON_H 1 - - /* Define to 1 if you have the `round' function. */ --/* #undef HAVE_ROUND */ -+#define HAVE_ROUND 1 - - /* Define to 1 if you have the `setlocale' function. */ - #define HAVE_SETLOCALE 1 -@@ -161,7 +161,7 @@ - /* #undef HAVE_STRLCPY */ - - /* Define to 1 if you have the `strtonum' function. */ --/* #undef HAVE_STRTONUM */ -+#define HAVE_STRTONUM 1 - - /* Define to 1 if `struct tm' is a member of `tm_zone'. */ - #define HAVE_STRUCT_TM_TM_ZONE 1 -@@ -226,10 +226,10 @@ - #define HAVE_VSNPRINTF 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_X11_XPM_H 1 -+/* #undef HAVE_X11_XPM_H */ - - /* Xpm available */ --#define HAVE_XPM 1 -+/* #undef HAVE_XPM */ - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_XPM_H */ -@@ -329,7 +329,7 @@ - #define SIZEOF_INT 4 - - /* The size of `long', as computed by sizeof. */ --#define SIZEOF_LONG 8 -+#define SIZEOF_LONG 4 - - /* The size of `long long', as computed by sizeof. */ - #define SIZEOF_LONG_LONG 8 diff --git a/package/gpsd/patches/patch-revision_h b/package/gpsd/patches/patch-revision_h deleted file mode 100644 index 98151f235..000000000 --- a/package/gpsd/patches/patch-revision_h +++ /dev/null @@ -1,5 +0,0 @@ ---- gpsd-2.92.orig/revision.h 2010-03-03 14:49:28.000000000 +0100 -+++ gpsd-2.92/revision.h 2010-04-03 10:22:22.843473239 +0200 -@@ -1 +1 @@ --#define REVISION "svn7020" -+#define REVISION "svnexported" -- cgit v1.2.3