From b779b6bd948f96d20d6f12cc5591b436256177d4 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 11 May 2012 00:24:14 +0000 Subject: gpsd: Remove package version from the navcom patch If the buildroot infrastructure finds a patch file that contains the $PKG-$VERSION tuple in the filename, it will only apply this kind of patches, ignoring the rest of the patches in the package directory. As a result of which, the gpsd-fix-libgpsmm.patch did not apply because the gpsd-2.95-navcom.patch satisfies the $PKG-$VERSION convention. The buildroot policy (as discussed during the Buildroot Developer meeting) is to remove the package version from the patch filename. Signed-off-by: Markos Chandras Signed-off-by: Peter Korsgaard --- package/gpsd/gpsd-navcom.patch | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/gpsd/gpsd-navcom.patch (limited to 'package/gpsd/gpsd-navcom.patch') diff --git a/package/gpsd/gpsd-navcom.patch b/package/gpsd/gpsd-navcom.patch new file mode 100644 index 000000000..659cea1d8 --- /dev/null +++ b/package/gpsd/gpsd-navcom.patch @@ -0,0 +1,47 @@ +[PATCH] Navcom needs binary support + +Enable binary support when navcom driver is enabled, otherwise the build +errors out with: + +./libgpsd.so: undefined reference to `navcom_binary' + +If no other drivers needing binary support are enabled. + +Signed-off-by: Peter Korsgaard +--- + driver_navcom.c | 4 ++-- + gpsd.h-tail | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: gpsd-2.95/driver_navcom.c +=================================================================== +--- gpsd-2.95.orig/driver_navcom.c ++++ gpsd-2.95/driver_navcom.c +@@ -44,7 +44,7 @@ + #include + #include "gpsd.h" + +-#if defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) ++#if defined(NAVCOM_ENABLE) + #include "bits.h" + + /* Have data which is 24 bits long */ +@@ -1339,4 +1339,4 @@ + }; + /* *INDENT-ON* */ + +-#endif /* defined(NAVCOM_ENABLE) && defined(BINARY_ENABLE) */ ++#endif /* defined(NAVCOM_ENABLE) */ +Index: gpsd-2.95/gpsd.h-tail +=================================================================== +--- gpsd-2.95.orig/gpsd.h-tail ++++ gpsd-2.95/gpsd.h-tail +@@ -30,7 +30,7 @@ + #ifdef EARTHMATE_ENABLE + #define ZODIAC_ENABLE + #endif +-#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) ++#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(NAVCOM_ENABLE) + #define BINARY_ENABLE + #endif + #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE) -- cgit v1.2.3