aboutsummaryrefslogtreecommitdiff
path: root/package/dhcp/dhcp.mk
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-04-26 18:56:13 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-05-09 21:30:26 +0200
commit9798ea7cfb8a5d222e5939860ba3adcf0292126b (patch)
treeb3349c9564c13bdc3e215676c0f9a9e52450321b /package/dhcp/dhcp.mk
parent39cd8cc9beb119d77a54a9fa7309ead2b18d563e (diff)
downloadbuildroot-9798ea7cfb8a5d222e5939860ba3adcf0292126b.tar.gz
buildroot-9798ea7cfb8a5d222e5939860ba3adcf0292126b.tar.bz2
package/dhcp: use system bind
Select bind instead of using the embedded bind libraries. This will help managing correctly all the bind dependencies such as zlib Fixes: - http://autobuild.buildroot.org/results/a61f24e9f117c81893c58befb20d21179e61b85b Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/dhcp/dhcp.mk')
-rw-r--r--package/dhcp/dhcp.mk31
1 files changed, 8 insertions, 23 deletions
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 9e7444eea6..1cef9724bd 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -9,13 +9,14 @@ DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
DHCP_INSTALL_STAGING = YES
DHCP_LICENSE = MPL-2.0
DHCP_LICENSE_FILES = LICENSE
+DHCP_DEPENDENCIES = bind
DHCP_CONF_ENV = \
CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1'
DHCP_CONF_OPTS = \
- --with-bind-extra-config="$(DHCP_BIND_CONF_OPTS)" \
+ --with-libbind=$(STAGING_DIR)/usr \
--with-randomdev=/dev/random \
--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -28,31 +29,15 @@ DHCP_CONF_OPTS = \
--with-relay-pid-file=/var/run/dhcrelay.pid \
--with-relay6-pid-file=/var/run/dhcrelay6.pid
-# bind does not support parallel builds.
-DHCP_MAKE = $(MAKE1)
-
-# bind configure is called via dhcp make instead of dhcp configure. The make env
-# needs extra values for bind configure.
-DHCP_MAKE_ENV = \
- $(TARGET_CONFIGURE_OPTS) \
- BUILD_CC="$(HOSTCC)" \
- BUILD_CFLAGS="$(HOST_CFLAGS)" \
- BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \
- BUILD_LDFLAGS="$(HOST_LDFLAGS)"
-
-ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
-DHCP_CONF_OPTS += --enable-delayed-ack
-endif
-
-ifeq ($(BR2_PACKAGE_ZLIB),y)
-DHCP_DEPENDENCIES += zlib
-DHCP_BIND_CONF_OPTS += --with-zlib
+ifeq ($(BR2_STATIC_LIBS),y)
+DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`"
+DHCP_CONF_OPTS += --disable-libtool
else
-DHCP_BIND_CONF_OPTS += --without-zlib
+DHCP_CONF_OPTS += --enable-libtool
endif
-ifeq ($(BR2_STATIC_LIBS),y)
-DHCP_BIND_CONF_OPTS += --without-dlopen
+ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
+DHCP_CONF_OPTS += --enable-delayed-ack
endif
ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)