From patchwork Thu Apr 5 12:28:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 150946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id D6B13B6FE9 for ; Thu, 5 Apr 2012 22:29:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 24236256C3; Thu, 5 Apr 2012 12:29:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k0E-IjCIIwhg; Thu, 5 Apr 2012 12:29:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AA14B253A9; Thu, 5 Apr 2012 12:29:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id EFA7D8F75B for ; Thu, 5 Apr 2012 12:29:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D1E7989AF8 for ; Thu, 5 Apr 2012 12:29:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HTW-cF93rmsP for ; Thu, 5 Apr 2012 12:29:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from multi.imgtec.com (multi.imgtec.com [194.200.65.239]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8DF588690A for ; Thu, 5 Apr 2012 12:29:18 +0000 (UTC) From: Markos Chandras To: Date: Thu, 5 Apr 2012 13:28:44 +0100 Message-ID: <1333628924-8966-1-git-send-email-markos.chandras@imgtec.com> X-Mailer: git-send-email 1.7.1 X-OriginalArrivalTime: 05 Apr 2012 12:29:14.0523 (UTC) FILETIME=[B63596B0:01CD1327] MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01181__2012_04_05_13_29_14 Subject: [Buildroot] [PATCH] gpsd: Add package version to libgpsmm patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 patch was renamed to match the rest of the patches in the gpsd folder. Signed-off-by: Markos Chandras --- package/gpsd/gpsd-2.95-fix-libgpsmm.patch | 23 +++++++++++++++++++++++ package/gpsd/gpsd-fix-libgpsmm.patch | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 package/gpsd/gpsd-2.95-fix-libgpsmm.patch delete mode 100644 package/gpsd/gpsd-fix-libgpsmm.patch diff --git a/package/gpsd/gpsd-2.95-fix-libgpsmm.patch b/package/gpsd/gpsd-2.95-fix-libgpsmm.patch new file mode 100644 index 0000000..893965e --- /dev/null +++ b/package/gpsd/gpsd-2.95-fix-libgpsmm.patch @@ -0,0 +1,23 @@ +diff -Nura gpsd-2.95.orig/Makefile.in gpsd-2.95.x/Makefile.in +--- gpsd-2.95.orig/Makefile.in 2010-07-13 19:48:24.000000000 -0300 ++++ gpsd-2.95.x/Makefile.in 2010-07-27 17:40:28.902568874 -0300 +@@ -546,7 +546,7 @@ + libgps_VERSION__REVISION = 0 + libgps_VERSION_AGE = 0 + libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) +-libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) ++libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) $(LDFLAGS) + lib_LTLIBRARIES = libgps.la libgpsd.la + libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE)) + libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION) +@@ -612,8 +612,8 @@ + 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 = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(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/gpsd-fix-libgpsmm.patch b/package/gpsd/gpsd-fix-libgpsmm.patch deleted file mode 100644 index 893965e..0000000 --- a/package/gpsd/gpsd-fix-libgpsmm.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nura gpsd-2.95.orig/Makefile.in gpsd-2.95.x/Makefile.in ---- gpsd-2.95.orig/Makefile.in 2010-07-13 19:48:24.000000000 -0300 -+++ gpsd-2.95.x/Makefile.in 2010-07-27 17:40:28.902568874 -0300 -@@ -546,7 +546,7 @@ - libgps_VERSION__REVISION = 0 - libgps_VERSION_AGE = 0 - libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) --libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) -+libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) $(LDFLAGS) - lib_LTLIBRARIES = libgps.la libgpsd.la - libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE)) - libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION) -@@ -612,8 +612,8 @@ - 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 = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@ -+@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(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