package/gpsd: bump version to 3.16

PATCH New Bernd Kuhls 2 participants 4 messages Jan 31, 2016

Share & tools

Bernd Kuhls

author

2016-01-31 20:04 UTC #0 lore raw

PATCH v3 1/2 package/gpsd: bump version to 3.16

Removed patch applied upstream:
http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=3e25e2167beb3936de3986fad9b6c9bdec82b81f

0001-Fix-build-against-musl-libc.patch is also not needed anymore after this commit:
http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=95c99f69e026e8c57aecba545e51c97f3b284e75

The upstream commit included in this version bump
http://git.savannah.gnu.org/cgit/gpsd.git/commit/libgps.pc.in?id=772eedf8a13c2c0468b1fd94beb5406dbfcb3b6e
fixes a build error with the location module of the updated sconeserver package included in this patch series:

../libtool: line 7486: cd: lib: No such file or directory
libtool: error: cannot determine absolute directory name of 'lib'
Makefile:428: recipe for target 'location.la' failed make[3]: *** [location.la] Error 1

Signed-off-by Bernd Kuhls <[email protected]>

---
v3: also removed 0001-Fix-build-against-musl-libc.patch (Baruch)
v2: no changes

 .../gpsd/0001-Fix-build-against-musl-libc.patch    |  36 --
 package/gpsd/0002-Address-Savannah-bug-46082.patch | 556 ---------------------
 package/gpsd/gpsd.hash                             |   4 +-
 package/gpsd/gpsd.mk                               |   2 +-
 4 files changed, 3 insertions(+), 595 deletions(-)
 delete mode 100644 package/gpsd/0001-Fix-build-against-musl-libc.patch
 delete mode 100644 package/gpsd/0002-Address-Savannah-bug-46082.patch

package/gpsd/0001-Fix-build-against-musl-libc.patch deleted +0 ~~-36~~

deleted file mode 100644
index c7c5b23..0000000
@@ -1,36 +0,0 @@
-From 2f1b033094df266008d9c4070cd7be33e93a4e12 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Fri, 19 Jun 2015 08:08:32 +0300
-Subject: [PATCH] Fix build against musl libc
-
-musl does not include sys/ttydefaults.h from sys/termios.h. Include it
-explicitly.
-
-Fixes build failures like:
-
-gpsmon.o: In function `main':
-gpsmon.c:(.text.startup+0x8f4): undefined reference to `CTRL'
-
-Upstream status: sent
-(http://lists.nongnu.org/archive/html/gpsd-dev/2015-06/msg00031.html)
-
-Signed-off-by: Baruch Siach <[email protected]>
----
- gpsmon.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gpsmon.c b/gpsmon.c
-index c3001c865821..0ccf74110b5a 100644
---- a/gpsmon.c
-+++ b/gpsmon.c
-@@ -20,6 +20,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/select.h>
-+#include <sys/ttydefaults.h>
- #include <fcntl.h>
- #include <unistd.h>
- 
--- 
-2.1.4
-

package/gpsd/0002-Address-Savannah-bug-46082.patch deleted +0 ~~-556~~

556 lines not on this page · raw message

package/gpsd/gpsd.hash +2 -2

index 8e27ff0..3083af2 100644
@@ -1,2 +1,2 @@
-# Locally calculated after checking pgp signature
-sha256	81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea	gpsd-3.15.tar.gz
+# Locally calculated
+sha256	03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029	gpsd-3.16.tar.gz

package/gpsd/gpsd.mk +1 -1

index 9ad19a8..4fe5d18 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSD_VERSION = 3.15
+GPSD_VERSION = 3.16
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
 GPSD_LICENSE = BSD-3c
 GPSD_LICENSE_FILES = COPYING

Signature · 1 line

2.7.0

Bernd Kuhls

author

2016-01-31 20:04 UTC #1 lore raw

PATCH v3 2/2 package/sconeserver: bump version to fix musl build

Fixes this musl build error:
TermBuffer.cpp: In member function ?virtual scx::Condition scx::TermBuffer::read(void*, int, int&)?:
TermBuffer.cpp:83:10: error: ?CEOT? was not declared in this scope

     case CEOT:
          ^

TermBuffer.cpp:123:10: error: ?CERASE? was not declared in this scope
case CERASE: // Backspace
^
The autobuilders did not catch this specific error yet because they failed earlier with other packages, but I am continuing the build based on the defconfig from:
http://autobuild.buildroot.net/results/6cc/6cc0f8c067e07deea688b9b97284601a596b898c/

- added hash
- removed 0001-fix-ssl-libs-ordering.patch, applied upstream:
https://github.com/sconemad/sconeserver/commit/ffb69ca18fd03d0dc976696144d215b3a8555155
- disabled markdown module because its git submodule cmark
( https://github.com/sconemad/sconeserver/tree/master/markdown ) has no cross-compile support provided by the sconeserver build system:

make[4]: Entering directory '/home/bernd/buildroot/br3/output/build/sconeserver-c4b8e14f6e9e06cbff5b4195f69d6fce9391a1cd/markdown/cmark' mkdir -p build; \
cd build; \

cmake .. \
	-G "Unix Makefiles" \
	-DCMAKE_BUILD_TYPE= \
	-DCMAKE_INSTALL_PREFIX=/usr/local

-- The C compiler identification is GNU 5.3.1 -- The CXX compiler identification is GNU 5.3.1 -- Check for working C compiler: /usr/bin/cc -- Check for working C compiler: /usr/bin/cc -- works [...]

Signed-off-by Bernd Kuhls <[email protected]>

---
v3: no changes
v2: updated comments in sconeserver.mk (Arnout)

 .../sconeserver/0001-fix-ssl-libs-ordering.patch   | 36 ----------------------
 package/sconeserver/sconeserver.hash               |  2 ++
 package/sconeserver/sconeserver.mk                 | 11 ++++---
 3 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 package/sconeserver/0001-fix-ssl-libs-ordering.patch
 create mode 100644 package/sconeserver/sconeserver.hash

package/sconeserver/0001-fix-ssl-libs-ordering.patch deleted +0 ~~-36~~

deleted file mode 100644
index f1f25b9..0000000
@@ -1,36 +0,0 @@
-configure: re-order SSL libs when linking
-
-When doing static builds, the ordering of libs is important, as the
-linker does not back-pedal to previous libraries specified on the
-command line to find missing symbols, and only searches for those
-missing symbols in the following libs.
-
-Thus, as -lssl needs symbols from -lcrypto, it needs to come before
--lcrypto.
-
-And globally, we do *not* append new libraries, we prepend them.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN a/configure.in b/configure.in
---- a/configure.in	2014-10-16 11:12:08.000000000 +0200
-+++ b/configure.in	2015-05-30 15:44:25.540329788 +0200
-@@ -133,12 +133,14 @@
-     [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL, use --with-openssl-path=PATH])]
-   )
-   AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data],
--    [SSL_LIBADD="$SSL_LIBADD -lcrypto"],
--    [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]
-+    [SSL_LIBADD="-lcrypto $SSL_LIBADD"],
-+    [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])],
-+    [$SSL_LIBADD]
-   )
-   AC_CHECK_LIB([ssl],[SSL_library_init],
--    [SSL_LIBADD="$SSL_LIBADD -lssl"],
--    [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]
-+    [SSL_LIBADD="-lssl $SSL_LIBADD"],
-+    [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])],
-+    [$SSL_LIBADD]
-   )
-   AC_SUBST(SSL_LIBADD)
- fi

package/sconeserver/sconeserver.hash new file +2 -0

new file mode 100644
index 0000000..2e1fe84
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	442c29ae93f615b610983187023ba6c1a9ca69526cb07f69576efba1d29d9daf	sconeserver-c4b8e14f6e9e06cbff5b4195f69d6fce9391a1cd.tar.gz

package/sconeserver/sconeserver.mk +6 -5

index 2072142..0a8158e 100644
@@ -4,16 +4,17 @@
 #
 ################################################################################
 
-# Release 0.6.0 doesn't build cleanly, so use a recent
-# Git commit.
-SCONESERVER_VERSION = 3b886c3dda6eda39bcb27472d29ed7fd3185ba1d
+SCONESERVER_VERSION = c4b8e14f6e9e06cbff5b4195f69d6fce9391a1cd
 SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION))
 SCONESERVER_LICENSE = GPLv2+
 SCONESERVER_LICENSE_FILES = COPYING
-# For 0001-fix-ssl-libs-ordering.patch and configure isn't up to date
+# upstream tarball does not contain a configure script
 SCONESERVER_AUTORECONF = YES
 SCONESERVER_DEPENDENCIES += pcre
-SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6
+# disable markdown module because its git submodule cmark
+# https://github.com/sconemad/sconeserver/tree/master/markdown
+# has no cross-compile support provided by the sconeserver build system
+SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown
 
 # Sconeserver configure script fails to find the libxml2 headers.
 ifeq ($(BR2_PACKAGE_LIBXML2),y)

Signature · 1 line

2.7.0

Thomas Petazzoni

2016-01-31 22:08 UTC #2 lore raw

PATCH v3 2/2 package/sconeserver: bump version to fix musl build

Dear Bernd Kuhls,

package/sconeserver/sconeserver.mk line 11

Quoted 9 lines · Bernd Kuhls

package/sconeserver/sconeserver.mk +2 -4

-# Release 0.6.0 doesn't build cleanly, so use a recent
-# Git commit.
-SCONESERVER_VERSION = 3b886c3dda6eda39bcb27472d29ed7fd3185ba1d
+SCONESERVER_VERSION = c4b8e14f6e9e06cbff5b4195f69d6fce9391a1cd
 SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION))
 SCONESERVER_LICENSE = GPLv2+
 SCONESERVER_LICENSE_FILES = COPYING
-# For 0001-fix-ssl-libs-ordering.patch and configure isn't up to date
+# upstream tarball does not contain a configure script

This comment is a bit wrong/misleading, because there is no such thing as an upstream tarball, as we're fetching from Git.

I've fixed that and applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2016-01-31 21:56 UTC #3 lore raw

PATCH v3 1/2 package/gpsd: bump version to 3.16

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 17 lines · Bernd Kuhls

Removed patch applied upstream:
http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=3e25e2167beb3936de3986fad9b6c9bdec82b81f
0001-Fix-build-against-musl-libc.patch is also not needed anymore after this commit:
http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=95c99f69e026e8c57aecba545e51c97f3b284e75
The upstream commit included in this version bump
http://git.savannah.gnu.org/cgit/gpsd.git/commit/libgps.pc.in?id=772eedf8a13c2c0468b1fd94beb5406dbfcb3b6e
fixes a build error with the location module of the updated sconeserver package included in this patch series:
../libtool: line 7486: cd: lib: No such file or directory
libtool: error: cannot determine absolute directory name of 'lib'
Makefile:428: recipe for target 'location.la' failed make[3]: *** [location.la] Error 1

Quoted 4 lines

Signed-off-by Bernd Kuhls <[email protected]>
---
v3: also removed 0001-Fix-build-against-musl-libc.patch (Baruch)
v2: no changes

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com