From: Markos Chandras <Markos.Chandras@imgtec.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] gpsd: Add package version to libgpsmm patch
Date: Fri, 11 May 2012 09:22:17 +0100 [thread overview]
Message-ID: <4FACCC39.9060806@imgtec.com> (raw)
In-Reply-To: <1333628924-8966-1-git-send-email-markos.chandras@imgtec.com>
On 04/05/2012 01:28 PM, Markos Chandras wrote:
> 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 <markos.chandras@imgtec.com>
> ---
> 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
> +
> +- at LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC
> --mode=link gcc $(libgps_la_LDFLAGS) -o $@
> +- at LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX
> --mode=link g++ $(libgps_la_LDFLAGS) -o $@
> ++ at LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC
> --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@
> ++ at 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
> -
> -- at LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC
> --mode=link gcc $(libgps_la_LDFLAGS) -o $@
> -- at LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX
> --mode=link g++ $(libgps_la_LDFLAGS) -o $@
> -+ at LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC
> --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@
> -+ at 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
> --
> 1.7.1
>
ping? :)
--
markos
next prev parent reply other threads:[~2012-05-11 8:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-05 12:28 [Buildroot] [PATCH] gpsd: Add package version to libgpsmm patch Markos Chandras
2012-05-11 8:22 ` Markos Chandras [this message]
2012-05-11 8:43 ` Thomas Petazzoni
2012-05-11 8:51 ` Markos Chandras
2012-05-11 9:01 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FACCC39.9060806@imgtec.com \
--to=markos.chandras@imgtec.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox