[ptxdist] [PATCH 26/28] gpsd: clean up patches

[Robert Schwebel <r.schwebel@pengutronix.de>]

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 ...001-fix-core-compiling-with-nmea-disabled.patch |   31 ++++++
 ...-breakage-if-some-drivers-are-not-enabled.patch |   50 +++++++++
 .../0003-fix-a-simple-compile-error.patch          |   30 ++++++
 patches/gpsd-2.39/0004-Fix-autotool-bug.patch      |   55 ++++++++++
 ...-rely-on-AM_PATH_PYTHON-to-work-propperly.patch |  108 ++++++++++++++++++++
 patches/gpsd-2.39/0006-fix-parallel-build.patch    |   42 ++++++++
 .../gpsd-2.39-configure_ac-fix-python.diff         |  104 -------------------
 patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff  |   55 ----------
 ...2.39-fix-core-compiling-with-nmea-disabled.diff |   32 ------
 ...k-breakage-if-some-drivers-are-not-enabled.diff |   50 ---------
 patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff   |   29 -----
 .../gpsd-2.39-fixup-parallel-build-for-python.diff |   38 -------
 patches/gpsd-2.39/series                           |    6 -
 13 files changed, 316 insertions(+), 314 deletions(-)
 create mode 100644 patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
 create mode 100644 patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
 create mode 100644 patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
 create mode 100644 patches/gpsd-2.39/0004-Fix-autotool-bug.patch
 create mode 100644 patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
 create mode 100644 patches/gpsd-2.39/0006-fix-parallel-build.patch
 delete mode 100644 patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
 delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
 delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
 delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
 delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
 delete mode 100644 patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
 delete mode 100644 patches/gpsd-2.39/series

diff --git a/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
new file mode 100644
index 0000000..1df2540
--- /dev/null
+++ b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
@@ -0,0 +1,31 @@
+From cd7bac7bb5b1b8794478345baf6f3303faf63fc1 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 1/6] fix core compiling with nmea disabled
+
+struct nmea is only defined in the driver union if NMEA_ENABLED is set.
+libpgsd_core however acquires if the ignore_trailing_edge in nmea is set
+or not carelessly if NMEA_ENABLED is set. Add an additional ifdef of
+NMEA_ENABLE to fix this.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ libgpsd_core.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libgpsd_core.c b/libgpsd_core.c
+index 28f787d..4109369 100644
+--- a/libgpsd_core.c
++++ b/libgpsd_core.c
+@@ -206,7 +206,7 @@ static /*@null@*/void *gpsd_ppsmonitor(void *arg)
+ 	    } else if (cycle > 999000 && cycle < 1001000 ) {
+ 		/* looks like PPS pulse or square wave */
+ 		if (duration > 499000 && duration < 501000
+-#ifdef GPSCLOCK_ENABLE
++#if defined(NMEA_ENABLE) && defined(GPSCLOCK_ENABLE)
+ 		  && session->driver.nmea.ignore_trailing_edge
+ #endif /* GPSCLOCK_ENABLE */
+ 		  ) {
+-- 
+1.7.7
+
diff --git a/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
new file mode 100644
index 0000000..486235e
--- /dev/null
+++ b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
@@ -0,0 +1,50 @@
+From b33c47ccc78040f4ef878b7c7abe5b22a19583d6 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Thu, 23 Apr 2009 18:18:54 +0200
+Subject: [PATCH 2/6] fix link breakage if some drivers are not enabled
+
+rtcm*_unpack and rtcm*_dump functions are only declared if the rtcm drivers are
+enabled during configuration. The same for aivdm. If these drivers are not
+enabled, linking will fail due to unknow reference. Add some ifdefs to avoid
+this. This is ugly ifdef hell. It'd be way eleganter to change the structures in
+driver code and put some function pointer checking in here. Due to lack of time
+I only did this quick hack. Better ideas are highly welcome.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ gpsdecode.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/gpsdecode.c b/gpsdecode.c
+index ffe898b..e18c698 100644
+--- a/gpsdecode.c
++++ b/gpsdecode.c
+@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpout)
+ 	else if (lexer.type == COMMENT_PACKET)
+ 	    continue;
+ 	else if (lexer.type == RTCM2_PACKET) {
++#if defined(RTCM104V2_ENABLE)
+ 	    rtcm2_unpack(&rtcm2, (char *)lexer.isgps.buf);
+ 	    rtcm2_dump(&rtcm2, buf, sizeof(buf));
+ 	    (void)fputs(buf, fpout);
++#endif
+ 	}
+ 	else if (lexer.type == RTCM3_PACKET) {
++#if defined(RTCM104V3_ENABLE)
+ 	    rtcm3_unpack(&rtcm3, (char *)lexer.outbuffer);
+ 	    rtcm3_dump(&rtcm3, stdout);
++#endif
+ 	}
+ 	else if (lexer.type == AIVDM_PACKET) {
++#if defined(aivdm_dump)
+ 	    /*@ -uniondef */
+ 	    if (aivdm_decode((char *)lexer.outbuffer, lexer.outbuflen, &aivdm))
+ 		aivdm_dump(&aivdm.decoded, scaled, labeled, stdout);
+ 	    /*@ +uniondef */
++#endif
+ 	}
+     }
+ }
+-- 
+1.7.7
+
diff --git a/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch b/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
new file mode 100644
index 0000000..8feb764
--- /dev/null
+++ b/patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
@@ -0,0 +1,30 @@
+From ce1f2edcdae7c7f1406d657cfa83d1608062bc60 Mon Sep 17 00:00:00 2001
+From: Juergen Beisert <jbeisert@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 3/6] fix a simple compile error
+
+This fixes the following compile error:
+
+.libs/drivers.o drivers.c:938: error: expected '}' before ';' token
+
+Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
+---
+ drivers.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers.c b/drivers.c
+index 89cd772..373476f 100644
+--- a/drivers.c
++++ b/drivers.c
+@@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(struct gps_device_t *session)
+ 
+ static const struct gps_type_t garmintxt = {
+     .type_name     = "Garmin Simple Text",		/* full name of type */
+-    .packet_type   = RTCM2_PACKET;	/* associated lexer packet type */
++    .packet_type   = RTCM2_PACKET,	/* associated lexer packet type */
+     .trigger       = NULL,		/* no recognition string */
+     .channels      = 0,			/* not used */
+     .probe_wakeup  = NULL,		/* no wakeup to be done before hunt */
+-- 
+1.7.7
+
diff --git a/patches/gpsd-2.39/0004-Fix-autotool-bug.patch b/patches/gpsd-2.39/0004-Fix-autotool-bug.patch
new file mode 100644
index 0000000..4272d74
--- /dev/null
+++ b/patches/gpsd-2.39/0004-Fix-autotool-bug.patch
@@ -0,0 +1,55 @@
+From 5308d2d0dff67a19a5b5f8c5793f5c4f8e366038 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Thu, 23 Apr 2009 15:15:21 +0200
+Subject: [PATCH 4/6] Fix autotool bug
+
+Original by Richard Hansen:
+Autoconf has a longstanding bug in AC_REQUIRE that causes out-of-order
+macro expansion problems.  This patch works around the Autoconf bug.
+
+lfu:
+This one fixes the configure script fails if run with --disable-python.
+Some macro needed by dependency tracker is errorneously expanded inside the
+python check condition, which cause that these will be failed to be set if
+python is not enabled.
+
+Signed-off-by: FIXME
+---
+ configure.ac |   21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7db2a6c..67e9253 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,27 @@ dnl AC_PREFIX_PROGRAM(gcc)
+ AM_CONFIG_HEADER(gpsd_config.h)
+ AC_LANG([C])
+ 
++# ACREQUIRE_BUGFIX
++# ----------------
++# Due to a longstanding Autoconf bug (Autoconf 2.50 to at least 2.63),
++# any macro that is AC_REQUIREd at any point must be AC_REQUIREd
++# *before* it is directly expanded.  The macros below were being
++# directly expanded before being AC_REQUIREd, so we AC_REQUIRE them
++# early to prevent out-of-order expansion problems.  See the threads
++# at:
++# http://lists.gnu.org/archive/html/bug-autoconf/2008-12/msg00039.html
++# http://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00058.html
++# http://lists.gnu.org/archive/html/bug-autoconf/2009-01/msg00019.html
++# http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00247.html
++AC_DEFUN_ONCE([ACREQUIRE_BUGFIX],
++[
++  AC_REQUIRE([AC_PROG_CPP])
++  AC_REQUIRE([AC_PROG_EGREP])
++  AC_REQUIRE([AC_PROG_CC])
++])
++ACREQUIRE_BUGFIX
++# ACREQUIRE_BUGFIX done
++
+ AC_ARG_ENABLE(python,
+   AC_HELP_STRING([--disable-python],
+ 		 [disable python scripts and library bindings]),
+-- 
+1.7.7
+
diff --git a/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch b/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
new file mode 100644
index 0000000..de0366a
--- /dev/null
+++ b/patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
@@ -0,0 +1,108 @@
+From 4d84d4119e2cde0ce062bc7c7db1709845fcca97 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 5/6] just rely on AM_PATH_PYTHON to work propperly
+
+remove hand crafted python detection and detection of
+PYTHON_LIBS and PYTHON_CFLAGS, they are not used anyway.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.ac |   77 ++++------------------------------------------------------
+ 1 files changed, 5 insertions(+), 72 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 67e9253..08f99a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,82 +27,15 @@ ACREQUIRE_BUGFIX
+ # ACREQUIRE_BUGFIX done
+ 
+ AC_ARG_ENABLE(python,
+-  AC_HELP_STRING([--disable-python],
++  AS_HELP_STRING([--disable-python],
+ 		 [disable python scripts and library bindings]),
+   [try_python="$enableval"], [try_python="yes"])
+-if test "x$try_python" = "xyes"; then
+-	AM_PATH_PYTHON
+-	ac_python=yes
+-	if test "x$PYTHON" = "x"; then
+-		AC_PATH_PROG(PYTHON, python, none)
+-	fi
+-
+-	if test "x$PYTHON" = "xnone"; then
+-	AC_MSG_WARN([*** Python interpreter not found, Python support disabled.])
+-		ac_python=no
+-	fi
+-
+-	if test "x$ac_python" = "xyes"; then
+-		AC_MSG_CHECKING(Python version and location)
+-		PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+-		PYTHON_VERSION_MAJOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[0]);"`]
+-		PYTHON_VERSION_MINOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[1]);"`]
+-		PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
+-		AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX])
+-
+-		AC_MSG_CHECKING(whether Python is at least 2.4)
+-		if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then
+-			AC_MSG_RESULT(no)
+-			AC_MSG_WARN([*** GPSD requires at least Python 2.3, Python support disabled.])
+-			ac_python=no
+-		fi
+-		if test "x$ac_python" = "xyes"; then
+-			AC_MSG_RESULT(yes)
+-
+-			PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
+-
+-			OLD_CPPFLAGS="$CPPFLAGS"
+-			OLD_CXXFLAGS="$CXXFLAGS"
+-			CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
+-			CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
+-
+-			AC_CHECK_HEADERS([Python.h],
+-					[],
+-					[AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no])
+-			CPPFLAGS="$OLD_CPPFLAGS"
+-			CXXFLAGS="$OLD_CXXFLAGS"
+ 
+-			if test "x$ac_python" = "xyes"; then
+-				AC_SUBST([PYTHON_CFLAGS])
+-
+-				ac_python=no
+-				for pylibpath in '/usr/lib' $PYTHON_PREFIX/lib $PYTHON_PREFIX/lib/python$PYTHON_VERSION/config; do
+-					eval `echo unset ac_cv_lib_python$PYTHON_VERSION'___'Py_Finalize | tr '.' '_'`
+-
+-					save_LIBS=$LIBS
+-					LIBS="$LIBS -L$pylibpath $PYTHON_LIBS"
+-					AC_CHECK_LIB(python$PYTHON_VERSION, Py_Finalize, PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes,,$PYTHON_DEPS)
+-					LIBS=$save_LIBS
+-					if test "x$ac_python" = "xyes"; then
+-						break
+-					fi
+-				done
+-
+-				if test "x$ac_python" != "xyes"; then
+-					AC_MSG_WARN(*** Python development libraries required, Python support disabled)
+-				fi
+-				AC_SUBST([PYTHON_LIBS])
+-
+-				AC_SUBST(pkgpythondir)
+-				if test "x$python_install" = "xyes"; then
+-					pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd"
+-				fi
+-
+-			fi
+-		fi
+-	fi
++if test "x$try_python" = "xyes"; then
++  AM_PATH_PYTHON([2.4], [have_python=yes], [have_python=no])
+ fi
+-AM_CONDITIONAL([HAVE_PYTHON], [test x"$ac_python" = xyes])
++
++AM_CONDITIONAL([HAVE_PYTHON], [test "${have_python}" = "yes"])
+ 
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-- 
+1.7.7
+
diff --git a/patches/gpsd-2.39/0006-fix-parallel-build.patch b/patches/gpsd-2.39/0006-fix-parallel-build.patch
new file mode 100644
index 0000000..e59bd2f
--- /dev/null
+++ b/patches/gpsd-2.39/0006-fix-parallel-build.patch
@@ -0,0 +1,42 @@
+From 791a4226f7c3f422e466efaedf61d880325bdf18 Mon Sep 17 00:00:00 2001
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:33:40 +0100
+Subject: [PATCH 6/6] fix parallel build
+
+The build system has a race with the creation of the python bindings; if
+both targets of the "gpspacket.so gpslib.so:" rule are started at the
+same time, the build "sometimes" breaks; this can be triggered with only
+a few cycles when built with -j16 on a 8-way box.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile.am |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 05e31f0..818c57a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -187,12 +187,17 @@ if HAVE_PYTHON
+ PYEXTENSIONS = gpspacket.so gpslib.so
+ noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
+ 
+-gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
++.PHONY: build_python_ext
++build_python_ext: gpspacket.c gpslib.c libgps.la
+ 	(pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
+-endif
++
++gpspacket.so: build_python_ext
++gpslib.so: build_python_ext
++
+ # Clean up after Python
+ clean-local:
+ 	rm -rf build
++endif
+ 
+ #
+ # Build test_gpsmm
+-- 
+1.7.7
+
diff --git a/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff b/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
deleted file mode 100644
index 121093e..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-configure_ac-fix-python.diff
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: just rely on AM_PATH_PYTHON to work propperly
-
-remove hand crafted python detection and detection of
-PYTHON_LIBS and PYTHON_CFLAGS, they are not used anyway.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- configure.ac |   77 +++--------------------------------------------------------
- 1 file changed, 5 insertions(+), 72 deletions(-)
-
-Index: gpsd-2.39/configure.ac
-===================================================================
---- gpsd-2.39.orig/configure.ac
-+++ gpsd-2.39/configure.ac
-@@ -27,82 +27,15 @@ ACREQUIRE_BUGFIX
- # ACREQUIRE_BUGFIX done
- 
- AC_ARG_ENABLE(python,
--  AC_HELP_STRING([--disable-python],
-+  AS_HELP_STRING([--disable-python],
- 		 [disable python scripts and library bindings]),
-   [try_python="$enableval"], [try_python="yes"])
--if test "x$try_python" = "xyes"; then
--	AM_PATH_PYTHON
--	ac_python=yes
--	if test "x$PYTHON" = "x"; then
--		AC_PATH_PROG(PYTHON, python, none)
--	fi
--
--	if test "x$PYTHON" = "xnone"; then
--	AC_MSG_WARN([*** Python interpreter not found, Python support disabled.])
--		ac_python=no
--	fi
--
--	if test "x$ac_python" = "xyes"; then
--		AC_MSG_CHECKING(Python version and location)
--		PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
--		PYTHON_VERSION_MAJOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[0]);"`]
--		PYTHON_VERSION_MINOR=[`$PYTHON -c "import sys; print '%d' % (sys.version_info[1]);"`]
--		PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
--		AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX])
--
--		AC_MSG_CHECKING(whether Python is at least 2.4)
--		if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 3; then
--			AC_MSG_RESULT(no)
--			AC_MSG_WARN([*** GPSD requires at least Python 2.3, Python support disabled.])
--			ac_python=no
--		fi
--		if test "x$ac_python" = "xyes"; then
--			AC_MSG_RESULT(yes)
- 
--			PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
--
--			OLD_CPPFLAGS="$CPPFLAGS"
--			OLD_CXXFLAGS="$CXXFLAGS"
--			CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS"
--			CXXFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
--
--			AC_CHECK_HEADERS([Python.h],
--					[],
--					[AC_MSG_WARN([*** Python include files not found! You should install the Python development package. Python support disabled]); ac_python=no])
--			CPPFLAGS="$OLD_CPPFLAGS"
--			CXXFLAGS="$OLD_CXXFLAGS"
--
--			if test "x$ac_python" = "xyes"; then
--				AC_SUBST([PYTHON_CFLAGS])
--
--				ac_python=no
--				for pylibpath in '/usr/lib' $PYTHON_PREFIX/lib $PYTHON_PREFIX/lib/python$PYTHON_VERSION/config; do
--					eval `echo unset ac_cv_lib_python$PYTHON_VERSION'___'Py_Finalize | tr '.' '_'`
--
--					save_LIBS=$LIBS
--					LIBS="$LIBS -L$pylibpath $PYTHON_LIBS"
--					AC_CHECK_LIB(python$PYTHON_VERSION, Py_Finalize, PYTHON_LIBS="-L$pylibpath -lpython$PYTHON_VERSION $PYTHON_DEPS"; ac_python=yes,,$PYTHON_DEPS)
--					LIBS=$save_LIBS
--					if test "x$ac_python" = "xyes"; then
--						break
--					fi
--				done
--
--				if test "x$ac_python" != "xyes"; then
--					AC_MSG_WARN(*** Python development libraries required, Python support disabled)
--				fi
--				AC_SUBST([PYTHON_LIBS])
--
--				AC_SUBST(pkgpythondir)
--				if test "x$python_install" = "xyes"; then
--					pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/gpsd"
--				fi
--
--			fi
--		fi
--	fi
-+if test "x$try_python" = "xyes"; then
-+  AM_PATH_PYTHON([2.4], [have_python=yes], [have_python=no])
- fi
--AM_CONDITIONAL([HAVE_PYTHON], [test x"$ac_python" = xyes])
-+
-+AM_CONDITIONAL([HAVE_PYTHON], [test "${have_python}" = "yes"])
- 
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff b/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
deleted file mode 100644
index 4a144e0..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix-autotool-bug.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Date: Thu, 23 Apr 2009 15:15:21 +0200
-Subject: [PATCH] Fix autotool bug
-
-Original by Richard Hansen:
-Autoconf has a longstanding bug in AC_REQUIRE that causes out-of-order
-macro expansion problems.  This patch works around the Autoconf bug.
-
-lfu:
-This one fixes the configure script fails if run with --disable-python.
-Some macro needed by dependency tracker is errorneously expanded inside the
-python check condition, which cause that these will be failed to be set if
-python is not enabled.
-
-Signed-off-by: FIXME
-
----
-
-[20110222 wsa: fixed in master meanwhile]
-
- configure.ac |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-Index: configure.ac
-===================================================================
---- a/configure.ac.orig
-+++ b/configure.ac
-@@ -5,6 +5,27 @@ dnl AC_PREFIX_PROGRAM(gcc)
- AM_CONFIG_HEADER(gpsd_config.h)
- AC_LANG([C])
- 
-+# ACREQUIRE_BUGFIX
-+# ----------------
-+# Due to a longstanding Autoconf bug (Autoconf 2.50 to at least 2.63),
-+# any macro that is AC_REQUIREd at any point must be AC_REQUIREd
-+# *before* it is directly expanded.  The macros below were being
-+# directly expanded before being AC_REQUIREd, so we AC_REQUIRE them
-+# early to prevent out-of-order expansion problems.  See the threads
-+# at:
-+# http://lists.gnu.org/archive/html/bug-autoconf/2008-12/msg00039.html
-+# http://lists.gnu.org/archive/html/autoconf-patches/2008-12/msg00058.html
-+# http://lists.gnu.org/archive/html/bug-autoconf/2009-01/msg00019.html
-+# http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00247.html
-+AC_DEFUN_ONCE([ACREQUIRE_BUGFIX],
-+[
-+  AC_REQUIRE([AC_PROG_CPP])
-+  AC_REQUIRE([AC_PROG_EGREP])
-+  AC_REQUIRE([AC_PROG_CC])
-+])
-+ACREQUIRE_BUGFIX
-+# ACREQUIRE_BUGFIX done
-+
- AC_ARG_ENABLE(python,
-   AC_HELP_STRING([--disable-python],
- 		 [disable python scripts and library bindings]),
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff b/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
deleted file mode 100644
index b487ea5..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Subject: [PATCH] fix core compiling with nmea disabled
-
-struct nmea is only defined in the driver union if NMEA_ENABLED is set.
-libpgsd_core however acquires if the ignore_trailing_edge in nmea is set
-or not carelessly if NMEA_ENABLED is set. Add an additional ifdef of
-NMEA_ENABLE to fix this.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
-
-[20110222 wsa: fixed in master meanwhile]
-
- libgpsd_core.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgpsd_core.c b/libgpsd_core.c
-index 8220eae..71dd5ba 100644
---- a/libgpsd_core.c
-+++ b/libgpsd_core.c
-@@ -206,7 +206,7 @@ static /*@null@*/void *gpsd_ppsmonitor(void *arg)
- 	    } else if (cycle > 999000 && cycle < 1001000 ) {
- 		/* looks like PPS pulse or square wave */
- 		if (duration > 499000 && duration < 501000
--#ifdef GPSCLOCK_ENABLE
-+#if defined(NMEA_ENABLE) && defined(GPSCLOCK_ENABLE)
- 		  && session->driver.nmea.ignore_trailing_edge
- #endif /* GPSCLOCK_ENABLE */
- 		  ) {
--- 
-1.6.2.1
-
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff b/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
deleted file mode 100644
index 5e832a2..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From dbc28fc8a50f47329ce7e579e35629318f95bf4b Mon Sep 17 00:00:00 2001
-From: Luotao Fu <l.fu@pengutronix.de>
-Date: Thu, 23 Apr 2009 18:18:54 +0200
-Subject: [PATCH] fix link breakage if some drivers are not enabled
-
-rtcm*_unpack and rtcm*_dump functions are only declared if the rtcm drivers are
-enabled during configuration. The same for aivdm. If these drivers are not
-enabled, linking will fail due to unknow reference. Add some ifdefs to avoid
-this. This is ugly ifdef hell. It'd be way eleganter to change the structures in
-driver code and put some function pointer checking in here. Due to lack of time
-I only did this quick hack. Better ideas are highly welcome.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
-
-[20110222 wsa: fixed in master meanwhile. Like this.]
-
- gpsdecode.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: gpsd-2.39/gpsdecode.c
-===================================================================
---- gpsd-2.39/gpsdecode.c.orig
-+++ gpsd-2.39/gpsdecode.c
-@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpo
- 	else if (lexer.type == COMMENT_PACKET)
- 	    continue;
- 	else if (lexer.type == RTCM2_PACKET) {
-+#if defined(RTCM104V2_ENABLE)
- 	    rtcm2_unpack(&rtcm2, (char *)lexer.isgps.buf);
- 	    rtcm2_dump(&rtcm2, buf, sizeof(buf));
- 	    (void)fputs(buf, fpout);
-+#endif
- 	}
- 	else if (lexer.type == RTCM3_PACKET) {
-+#if defined(RTCM104V3_ENABLE)
- 	    rtcm3_unpack(&rtcm3, (char *)lexer.outbuffer);
- 	    rtcm3_dump(&rtcm3, stdout);
-+#endif
- 	}
- 	else if (lexer.type == AIVDM_PACKET) {
-+#if defined(aivdm_dump)
- 	    /*@ -uniondef */
- 	    if (aivdm_decode((char *)lexer.outbuffer, lexer.outbuflen, &aivdm))
- 		aivdm_dump(&aivdm.decoded, scaled, labeled, stdout);
- 	    /*@ +uniondef */
-+#endif
- 	}
-     }
- }
diff --git a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff b/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
deleted file mode 100644
index 4438e84..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fix_build_error.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Juergen Beisert <jbeisert@pengutronix.de>
-Subject: [PATCH] fix a simple compile error
-
-This fixes the following compile error:
-
-.libs/drivers.o drivers.c:938: error: expected '}' before ';' token
-
-Signed-off-by: Juergen Beisert <jbeisert@pengutronix.de>
-
----
-
-[20110222 wsa: fixed in master meanwhile]
-
- drivers.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gpsd-2.39/drivers.c
-===================================================================
---- gpsd-2.39/drivers.c.orig
-+++ gpsd-2.39/drivers.c
-@@ -935,7 +935,7 @@ static gps_mask_t garmintxt_parse_input(
- 
- static const struct gps_type_t garmintxt = {
-     .type_name     = "Garmin Simple Text",		/* full name of type */
--    .packet_type   = RTCM2_PACKET;	/* associated lexer packet type */
-+    .packet_type   = RTCM2_PACKET,	/* associated lexer packet type */
-     .trigger       = NULL,		/* no recognition string */
-     .channels      = 0,			/* not used */
-     .probe_wakeup  = NULL,		/* no wakeup to be done before hunt */
diff --git a/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff b/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
deleted file mode 100644
index 02d7425..0000000
--- a/patches/gpsd-2.39/gpsd-2.39-fixup-parallel-build-for-python.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [PATCH] fix parallel build
-
-The build system has a race with the creation of the python bindings; if
-both targets of the "gpspacket.so gpslib.so:" rule are started at the
-same time, the build "sometimes" breaks; this can be triggered with only
-a few cycles when built with -j16 on a 8-way box.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- Makefile.am |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-Index: gpsd-2.39/Makefile.am
-===================================================================
---- gpsd-2.39.orig/Makefile.am
-+++ gpsd-2.39/Makefile.am
-@@ -187,12 +187,17 @@ if HAVE_PYTHON
- PYEXTENSIONS = gpspacket.so gpslib.so
- noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
- 
--gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
-+.PHONY: build_python_ext
-+build_python_ext: gpspacket.c gpslib.c libgps.la
- 	(pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
--endif
-+
-+gpspacket.so: build_python_ext
-+gpslib.so: build_python_ext
-+
- # Clean up after Python
- clean-local:
- 	rm -rf build
-+endif
- 
- #
- # Build test_gpsmm
diff --git a/patches/gpsd-2.39/series b/patches/gpsd-2.39/series
deleted file mode 100644
index 0340e8d..0000000
--- a/patches/gpsd-2.39/series
+++ /dev/null
@@ -1,6 +0,0 @@
-gpsd-2.39-fix-core-compiling-with-nmea-disabled.diff
-gpsd-2.39-fix-link-breakage-if-some-drivers-are-not-enabled.diff
-gpsd-2.39-fix_build_error.diff
-gpsd-2.39-fix-autotool-bug.diff
-gpsd-2.39-configure_ac-fix-python.diff
-gpsd-2.39-fixup-parallel-build-for-python.diff
-- 
1.7.7


-- 
ptxdist mailing list
ptxdist@pengutronix.de