package/bind: reorder openssl variables

openssl is mandatory since bump to version 9.16.26 in commit
8adeaec8af so move openssl variables in
the beginning of bind.mk instead of keeping them in the middle of the
file. Moreover, drop "BIND_DEPENDENCIES += host-pkgconf zlib" as
host-pkgconf is already mandatory

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2022-03-13 10:21:47 +01:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 52686b220d
commit 4b127b0c1b

View File

@ -28,7 +28,8 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen
BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
BIND_CONF_ENV = \
BUILD_CC="$(TARGET_CC)" \
BUILD_CFLAGS="$(TARGET_CFLAGS)"
BUILD_CFLAGS="$(TARGET_CFLAGS)" \
LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
BIND_CONF_OPTS = \
$(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \
--without-lmdb \
@ -36,14 +37,17 @@ BIND_CONF_OPTS = \
--with-randomdev=/dev/urandom \
--enable-epoll \
--enable-filter-aaaa \
--disable-backtrace
--disable-backtrace \
--with-openssl=$(STAGING_DIR)/usr \
--with-ecdsa=yes \
--with-eddsa=no \
--with-aes=yes
BIND_DEPENDENCIES = libuv
BIND_DEPENDENCIES = host-pkgconf libuv openssl
ifeq ($(BR2_PACKAGE_ZLIB),y)
BIND_CONF_OPTS += --with-zlib
BIND_DEPENDENCIES += zlib
BIND_DEPENDENCIES += host-pkgconf zlib
else
BIND_CONF_OPTS += --without-zlib
endif
@ -69,13 +73,6 @@ else
BIND_CONF_OPTS += --with-libxml2=no
endif
BIND_DEPENDENCIES += host-pkgconf openssl
BIND_CONF_OPTS += \
--with-openssl=$(STAGING_DIR)/usr \
--with-ecdsa=yes \
--with-eddsa=no \
--with-aes=yes
BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
# GOST cipher support requires openssl extra engines
ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
BIND_CONF_OPTS += --with-gost=yes