Skip to contentSkip to conversation

gpsd: backport upstream patches pending 3.11 release

PATCH New spdawson at gmail.com 2 participants 2 messages Dec 9, 2013 – Dec 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpsd: backport upstream patches pending 3.11 release

From: Simon Dawson <[email protected]>

The 3.11 release of gpsd is imminent; in the meantime, backport some patches from upstream to fix some of the autobuild failures.

Also bump to the most recent Git snapshot.

---
 .../gpsd/gpsd-02-sconstruct-disable-rpath.patch    | 16 +++++---
 ...bx_mode-link-error-when-reconfigure-false.patch | 48 ++++++++++++++++++++++
 ...4-gpsmon-fix-build-when-reconfigure-false.patch | 46 +++++++++++++++++++++
 .../gpsd-05-gpsmon-fix-build-when-nmea-false.patch | 46 +++++++++++++++++++++
 package/gpsd/gpsd.mk                               |  2 +-
 5 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch
 create mode 100644 package/gpsd/gpsd-04-gpsmon-fix-build-when-reconfigure-false.patch
 create mode 100644 package/gpsd/gpsd-05-gpsmon-fix-build-when-nmea-false.patch
package/gpsd/gpsd-02-sconstruct-disable-rpath.patch +10 -6
index 8d2d31e..155542d 100644
@@ -1,16 +1,20 @@
 Disable addition of RPATH to the generated libraries
 
+Signed-off-by: Simon Dawson <[email protected]>
 Signed-off-by: Thomas Petazzoni <[email protected]>
 
 diff -Nurp a/SConstruct b/SConstruct
 --- a/SConstruct	2013-11-22 13:10:01.000000000 +0000
 +++ b/SConstruct	2013-11-23 11:26:57.698486777 +0000
-@@ -299,8 +299,6 @@ if env["sysroot"]:
- # prefix=/usr/local build want to put our libraries there. Ideally
- # we'd query the default load path here and test against wharever it
- # is, but we haven't found a way to do that.
--if env["shared"] and env["libdir"] not in {"/lib","/usr/lib","/usr/local/lib"}:
--    env.Prepend(RPATH=[installdir('libdir')])
+@@ -299,11 +299,6 @@ if env["sysroot"]:
+ # system default load path. /lib and /usr/lib should always be on
+ # this; listing them explicitly is a fail-safe against this ldconfig
+ # invocation not doing what we expect.
+-if env["shared"]:
+-    sysrpath = Split(_getoutput("ldconfig -v -N -X 2>/dev/null | sed -n -e '/^\//s/://p'"))
+-    if env["libdir"] not in ["/usr/lib", "/lib"] + sysrpath:
+-        announce("Prepending %s to RPATH." % installdir('libdir'))
+-        env.Prepend(RPATH=[installdir('libdir')])
  
  # Give deheader a way to set compiler flags
  if 'MORECFLAGS' in os.environ:
package/gpsd/gpsd-03-Fix-ubx_mode-link-error-when-reconfigure-false.patch new file +48 -0

48 lines not on this page · raw message

package/gpsd/gpsd-04-gpsmon-fix-build-when-reconfigure-false.patch new file +46 -0

46 lines not on this page · raw message

package/gpsd/gpsd-05-gpsmon-fix-build-when-nmea-false.patch new file +46 -0

46 lines not on this page · raw message

package/gpsd/gpsd.mk +1 -1
index 261afde..24b0146 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSD_VERSION = 327a3ef7c83c1b3b2cf7cdfcddf0c6fd7aaa8963
+GPSD_VERSION = a496a59c81173881900d976be35752787f4ab38c
 GPSD_SITE = git://git.savannah.nongnu.org/gpsd.git
 GPSD_LICENSE = BSD-3c
 GPSD_LICENSE_FILES = COPYING
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 gpsd: backport upstream patches pending 3.11 release

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"spdawson" == spdawson <[email protected]> writes:

From: Simon Dawson <[email protected]>
The 3.11 release of gpsd is imminent; in the meantime, backport some patches from upstream to fix some of the autobuild failures.

Also bump to the most recent Git snapshot.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard