package/gnutls: remove redundant --enable-openssl-compatibility
The option is set a few lines below depending on BR2_PACKAGE_GNUTLS_OPENSSL. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [yann.morin.1998@free.fr: move it all under a single conditional block] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
parent
00a046e455
commit
91b10ec79a
@ -12,11 +12,6 @@ GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
|
||||
GNUTLS_LICENSE = LGPL-2.1+ (core library)
|
||||
GNUTLS_LICENSE_FILES = doc/COPYING.LESSER
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
|
||||
GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
|
||||
GNUTLS_LICENSE_FILES += doc/COPYING
|
||||
endif
|
||||
|
||||
GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle
|
||||
GNUTLS_CPE_ID_VENDOR = gnu
|
||||
GNUTLS_CONF_OPTS = \
|
||||
@ -25,7 +20,6 @@ GNUTLS_CONF_OPTS = \
|
||||
--disable-libdane \
|
||||
--disable-rpath \
|
||||
--disable-tests \
|
||||
--enable-openssl-compatibility \
|
||||
--without-libcrypto-prefix \
|
||||
--without-libdl-prefix \
|
||||
--without-libev-prefix \
|
||||
@ -36,7 +30,6 @@ GNUTLS_CONF_OPTS = \
|
||||
--without-librt-prefix \
|
||||
--without-libz-prefix \
|
||||
--without-tpm \
|
||||
$(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \
|
||||
$(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \
|
||||
$(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),--enable,--disable)-ssl2-support \
|
||||
$(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),--enable,--disable)-gost
|
||||
@ -47,6 +40,14 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
|
||||
gl_cv_func_gettimeofday_clobber=no
|
||||
GNUTLS_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
|
||||
GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
|
||||
GNUTLS_LICENSE_FILES += doc/COPYING
|
||||
GNUTLS_CONF_OPTS += --enable-openssl-compatibility
|
||||
else
|
||||
GNUTLS_CONF_OPTS += --disable-openssl-compatibility
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
|
||||
GNUTLS_CONF_OPTS += --enable-cryptodev
|
||||
GNUTLS_DEPENDENCIES += cryptodev-linux
|
||||
|
Loading…
Reference in New Issue
Block a user