diff --git a/package/sconeserver/0001-fix-ssl-libs-ordering.patch b/package/sconeserver/0001-fix-ssl-libs-ordering.patch deleted file mode 100644 index f1f25b905a..0000000000 --- a/package/sconeserver/0001-fix-ssl-libs-ordering.patch +++ /dev/null @@ -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" - -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 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 diff --git a/package/sconeserver/sconeserver.hash b/package/sconeserver/sconeserver.hash new file mode 100644 index 0000000000..2e1fe84237 --- /dev/null +++ b/package/sconeserver/sconeserver.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 442c29ae93f615b610983187023ba6c1a9ca69526cb07f69576efba1d29d9daf sconeserver-c4b8e14f6e9e06cbff5b4195f69d6fce9391a1cd.tar.gz diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 2072142c2d..ed1133e406 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -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 +# fetching from Git, we need to generate the 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)