gnutls: load libunistring-optional gnulib module
Since a few days staging_dir/host/share/aclocal/ contains new m4 files (libunistring-base.m4, libunistring-optional.m4, libunistring.m4 etc.) that get applied during autoreconf. This changes the libunistring setup enough that we run into problem (builds fail). Load the libunistring-optional gnulib module in configure.ac to be able to add/use the new configure switch "--with-included-libunistring". This is at most a workaround. This should be followed up with gnutls upstream to clean this up. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
parent
391f097947
commit
7310e7fc99
2 changed files with 13 additions and 1 deletions
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gnutls
|
PKG_NAME:=gnutls
|
||||||
PKG_VERSION:=3.8.0
|
PKG_VERSION:=3.8.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
PKG_BUILD_FLAGS:=no-mips16
|
PKG_BUILD_FLAGS:=no-mips16
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
|
@ -132,6 +132,7 @@ CONFIGURE_ARGS+= \
|
||||||
--without-idn \
|
--without-idn \
|
||||||
--with-default-trust-store-dir=/etc/ssl/certs/ \
|
--with-default-trust-store-dir=/etc/ssl/certs/ \
|
||||||
--with-included-unistring \
|
--with-included-unistring \
|
||||||
|
--with-included-libunistring \
|
||||||
--with-librt-prefix="$(LIBRT_ROOT_DIR)/" \
|
--with-librt-prefix="$(LIBRT_ROOT_DIR)/" \
|
||||||
--with-pic \
|
--with-pic \
|
||||||
--with-system-priority-file="" \
|
--with-system-priority-file="" \
|
||||||
|
|
11
libs/gnutls/patches/030-unistring-optional.patch
Normal file
11
libs/gnutls/patches/030-unistring-optional.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -471,6 +471,8 @@ DEFAULT_VALGRINDFLAGS='-q --error-exitco
|
||||||
|
|
||||||
|
gl_VALGRIND_TESTS_DEFAULT_NO
|
||||||
|
|
||||||
|
+gl_LIBUNISTRING_OPTIONAL
|
||||||
|
+
|
||||||
|
dnl Note that g*l_INIT are run after we check for library capabilities,
|
||||||
|
dnl to prevent issues from caching lib dependencies. See discussion
|
||||||
|
dnl in https://bugs.gentoo.org/show_bug.cgi?id=494940 and
|
Loading…
Reference in a new issue