NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gnutls: remove unused libregex dependency

Browse Source 
The pcre/libregex dependency was removed in version 3.7.3 with upstream
commit 26578b7d02c269ff1d34ff782d84c7667734d03d, which removed the
bundled libopts. Remove the pcre dependency and the relevant CONF_OPTS
handling.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind) 2022-05-12 18:01:13 +02:00 committed by Yann E. MORIN
parent b707a67daa
commit 00a046e455
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gnutls/Config.in
View File

@ -7,7 +7,6 @@ config BR2_PACKAGE_GNUTLS
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBTASN1 select BR2_PACKAGE_LIBTASN1
select BR2_PACKAGE_NETTLE select BR2_PACKAGE_NETTLE
select BR2_PACKAGE_PCRE
help help
GnuTLS is a secure communications library implementing the SSL GnuTLS is a secure communications library implementing the SSL
and TLS protocols and technologies around them. and TLS protocols and technologies around them.

11
package/gnutls/gnutls.mk
View File

@ -17,7 +17,7 @@ GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES += doc/COPYING GNUTLS_LICENSE_FILES += doc/COPYING
endif endif
GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle
GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CPE_ID_VENDOR = gnu
GNUTLS_CONF_OPTS = \ GNUTLS_CONF_OPTS = \
--disable-doc \ --disable-doc \
@ -25,7 +25,6 @@ GNUTLS_CONF_OPTS = \
--disable-libdane \ --disable-libdane \
--disable-rpath \ --disable-rpath \
--disable-tests \ --disable-tests \
--enable-local-libopts \
--enable-openssl-compatibility \ --enable-openssl-compatibility \
--without-libcrypto-prefix \ --without-libcrypto-prefix \
--without-libdl-prefix \ --without-libdl-prefix \
@ -48,14 +47,6 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
gl_cv_func_gettimeofday_clobber=no gl_cv_func_gettimeofday_clobber=no
GNUTLS_INSTALL_STAGING = YES GNUTLS_INSTALL_STAGING = YES
# gnutls needs libregex, but pcre can be used too
# The check isn't cross-compile friendly
GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
GNUTLS_CONF_OPTS += \
--with-regex-header=pcreposix.h \
--with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
--with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
GNUTLS_CONF_OPTS += --enable-cryptodev GNUTLS_CONF_OPTS += --enable-cryptodev
GNUTLS_DEPENDENCIES += cryptodev-linux GNUTLS_DEPENDENCIES += cryptodev-linux