From patchwork Mon Aug 25 09:40:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 382674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7740914009E for ; Mon, 25 Aug 2014 19:40:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F218B88D80; Mon, 25 Aug 2014 09:40:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ujKPuyaKz3gK; Mon, 25 Aug 2014 09:40:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3F29693100; Mon, 25 Aug 2014 09:40:37 +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 4E5671CED8B for ; Mon, 25 Aug 2014 09:40:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 497ED8FFA5 for ; Mon, 25 Aug 2014 09:40:36 +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 g6O4A5dj8ZFr for ; Mon, 25 Aug 2014 09:40:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id E63D48FECD for ; Mon, 25 Aug 2014 09:40:34 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id bs8so2245622wib.3 for ; Mon, 25 Aug 2014 02:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=p3MIRT3RTYyQbJz3Cax7CfPMsoSh2sG0ftRo5fVsoSs=; b=fmOiaIqQxWWCBhZYIe7tzYd220IqzQDwKyccniqm+SsDePyM2dmY0O5H1Dh8Yvni1R HgC3GJ51khg/H7lYoQsms/J9xNWWJkflsI50/iAJd2NzPylEJrO7uA/bLjQubLe6vkpT 6VLK8PscqdmIs0LUVAaO1rRViDKg7ju9y/4wejs0YPVwbeIs5mb9nHmaBiCjrB3wgcTw FC8kC8HoHjEAbppc4pRLQCcRqDRQh1uxeAAILPnCu7RfYVsUCwo5tGuQm6HYeVg03DMR 4fEv3WbAb64nxKiZutLBsk3h+x90n9bvx3QqeBXiUJkpPSnMESBEyWt84tqYWGqrlbZL Nxlw== X-Received: by 10.194.173.234 with SMTP id bn10mr7936532wjc.81.1408959633310; Mon, 25 Aug 2014 02:40:33 -0700 (PDT) Received: from leto.lan (88-105-223-135.dynamic.dsl.as9105.com. [88.105.223.135]) by mx.google.com with ESMTPSA id es9sm98669616wjd.1.2014.08.25.02.40.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Aug 2014 02:40:32 -0700 (PDT) From: Simon Dawson To: buildroot@busybox.net Date: Mon, 25 Aug 2014 10:40:23 +0100 Message-Id: <1408959623-26890-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] gpsd: bump version to 3.11 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Simon Dawson --- ...d-01-Fix-build-error-when-ntpshm-is-false.patch | 46 ++++++++++++++++++++++ .../gpsd/gpsd-02-sconstruct-disable-rpath.patch | 16 ++++---- package/gpsd/gpsd.mk | 7 ++-- 3 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch diff --git a/package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch b/package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch new file mode 100644 index 0000000..d69d9e2 --- /dev/null +++ b/package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch @@ -0,0 +1,46 @@ +From 8e081f1bd5c82b842ee317cd55e70f646ae31f05 Mon Sep 17 00:00:00 2001 +From: Simon Dawson +Date: Mon, 25 Aug 2014 10:26:11 +0100 +Subject: [PATCH] Fix build error when ntpshm is false +To: gpsd-dev@nongnu.org + +The build fails as follows + +libgpsd_core.c: In function 'ntpshm_latch': +libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset' + || device->device_type->time_offset == NULL) + ^ +libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset' + fix_time += device->device_type->time_offset(device); + ^ +scons: *** [libgpsd_core.os] Error 1 + +The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function + +Signed-off-by: Simon Dawson +--- + libgpsd_core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgpsd_core.c b/libgpsd_core.c +index 6ec08a4..f7e8075 100644 +--- a/libgpsd_core.c ++++ b/libgpsd_core.c +@@ -1638,6 +1638,7 @@ void gpsd_zero_satellites( /*@out@*/ struct gps_data_t *out) + #endif + } + ++#ifdef NTPSHM_ENABLE + void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td) + /* latch the fact that we've saved a fix */ + { +@@ -1668,5 +1669,6 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td) + device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9; + #endif /* S_SPLINT_S */ + } ++#endif /* NTPSHM_ENABLE */ + + /* end */ +-- +1.9.1 + diff --git a/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch index 5cbdf13..8251cfc 100644 --- a/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch +++ b/package/gpsd/gpsd-02-sconstruct-disable-rpath.patch @@ -4,16 +4,14 @@ Signed-off-by: Simon Dawson Signed-off-by: Thomas Petazzoni 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,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. +--- a/SConstruct 2014-08-23 18:41:09.000000000 +0100 ++++ b/SConstruct 2014-08-25 09:46:53.754364989 +0100 +@@ -300,9 +300,6 @@ if env["sysroot"]: + + # Don't hack RPATH unless libdir points somewhere that is not on the + # minimum default load path. -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', False)) +- if env["libdir"] not in ["/usr/lib", "/lib"]: - env.Prepend(RPATH=[installdir('libdir')]) # Give deheader a way to set compiler flags diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 0f655ba..7dc27e8 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,8 +4,8 @@ # ################################################################################ -GPSD_VERSION = b4c32aa40cff1b4e1041d5f3004e9d9156cdf96f -GPSD_SITE = git://git.savannah.nongnu.org/gpsd.git +GPSD_VERSION = 3.11 +GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-3c GPSD_LICENSE_FILES = COPYING GPSD_INSTALL_STAGING = YES @@ -19,7 +19,6 @@ GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) GPSD_SCONS_OPTS = \ arch=$(ARCH)\ prefix=/usr\ - chrpath=no\ sysroot=$(STAGING_DIR)\ strip=no\ python=no @@ -48,7 +47,7 @@ ifeq ($(BR2_PACKAGE_QT_NETWORK),y) GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)" GPSD_DEPENDENCIES += qt host-pkgconf else - GPSD_SCONS_OPTS += libQgpsmm=no + GPSD_SCONS_OPTS += qt=no endif # If libusb is available build it before so the package can use it