aboutsummaryrefslogtreecommitdiff
path: root/package/dhcp/dhcp.mk
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-04-18 15:17:33 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-04-20 16:30:31 +0200
commitd8df8cb98471098ad39e1904786e354a0d423e71 (patch)
treecd608fc4b0abb9a045fb055736023a7254a54ae3 /package/dhcp/dhcp.mk
parentb58a6bf774baf56c3a73a838acb8a5472594ce82 (diff)
downloadbuildroot-d8df8cb98471098ad39e1904786e354a0d423e71.tar.gz
buildroot-d8df8cb98471098ad39e1904786e354a0d423e71.tar.bz2
package/dhcp: bump to version 4.4.1
- Use --with-bind-extra-config option to: - add --without-zlib otherwise static build will fail if zlib is found on host - Add --without-dlopen otherwise static build will fail - Drop all patches (already in version) - Drop autoreconf (not needed anymore) - Update license to MPL-2.0: https://www.isc.org/blogs/isc-dhcp-moves-to-mpl-2-0-license - Update hash of license file 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.mk26
1 files changed, 13 insertions, 13 deletions
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index a1285184d3..812e4870b9 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -4,10 +4,10 @@
#
################################################################################
-DHCP_VERSION = 4.3.6
+DHCP_VERSION = 4.4.1
DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION)
DHCP_INSTALL_STAGING = YES
-DHCP_LICENSE = ISC
+DHCP_LICENSE = MPL-2.0
DHCP_LICENSE_FILES = LICENSE
DHCP_CONF_ENV = \
CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
@@ -15,6 +15,7 @@ DHCP_CONF_ENV = \
CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1'
DHCP_CONF_OPTS = \
+ --with-bind-extra-config="$(DHCP_BIND_CONF_OPTS)" \
--with-randomdev=/dev/random \
--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -27,17 +28,6 @@ DHCP_CONF_OPTS = \
--with-relay-pid-file=/var/run/dhcrelay.pid \
--with-relay6-pid-file=/var/run/dhcrelay6.pid
-# The source for the bind libraries used by dhcp are embedded in the dhcp source
-# as a tar-ball. Extract the bind source to allow any patches to be applied
-# during the patch phase.
-define DHCP_EXTRACT_BIND
- cd $(@D)/bind; tar -xvf bind.tar.gz
-endef
-DHCP_POST_EXTRACT_HOOKS += DHCP_EXTRACT_BIND
-
-# The patchset requires configure et.al. to be regenerated.
-DHCP_AUTORECONF = YES
-
# bind does not support parallel builds.
DHCP_MAKE = $(MAKE1)
@@ -54,6 +44,16 @@ ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
DHCP_CONF_OPTS += --enable-delayed-ack
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+DHCP_BIND_CONF_OPTS += --with-zlib
+else
+DHCP_BIND_CONF_OPTS += --without-zlib
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+DHCP_BIND_CONF_OPTS += --without-dlopen
+endif
+
ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
define DHCP_INSTALL_SERVER
mkdir -p $(TARGET_DIR)/var/lib