summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-11-08 12:26:52 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-11-10 08:15:53 (GMT)
commitf8c07f2e72ba4faea6e66b40f9b4881aecb2e509 (patch)
treee9c6bf01108926d1fd9e5e45c06b142ad5ee14dd
parentaf616db359fd0811736821f23971094c6600f5bf (diff)
downloadbuildroot-f8c07f2e72ba4faea6e66b40f9b4881aecb2e509.tar.gz
buildroot-f8c07f2e72ba4faea6e66b40f9b4881aecb2e509.tar.bz2
dhcpcd: bump to version 6.1.0
Now has proper support for nommu and non-IPv6. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/dhcpcd/Config.in8
-rw-r--r--package/dhcpcd/dhcpcd.mk17
2 files changed, 15 insertions, 10 deletions
diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
index ddbc6f4..ac20615 100644
--- a/package/dhcpcd/Config.in
+++ b/package/dhcpcd/Config.in
@@ -1,11 +1,9 @@
config BR2_PACKAGE_DHCPCD
- depends on BR2_INET_IPV6
- depends on BR2_USE_MMU # fork()
bool "dhcpcd"
+ # No support for AI_ADDRCONFIG
+ depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+ !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
help
An RFC2131 compliant DHCP client
http://roy.marples.name/downloads/dhcpcd
-
-comment "dhcpcd needs a toolchain w/ IPv6"
- depends on !BR2_INET_IPV6
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 13810f3..8037706 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -4,22 +4,29 @@
#
################################################################################
-DHCPCD_VERSION = 5.6.7
+DHCPCD_VERSION = 6.1.0
DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2
-DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd/
+DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
DHCPCD_LICENSE = BSD-2c
+ifeq ($(BR2_INET_IPV6),)
+ DHCPCD_CONFIG_OPT += --disable-ipv6
+endif
+
+ifeq ($(BR2_USE_MMU),)
+ DHCPCD_CONFIG_OPT += --disable-fork
+endif
+
define DHCPCD_CONFIGURE_CMDS
(cd $(@D); \
- ./configure \
+ $(TARGET_CONFIGURE_OPTS) ./configure \
--target=$(BR2_GCC_TARGET_ARCH) \
--os=linux \
$(DHCPCD_CONFIG_OPT) )
endef
define DHCPCD_BUILD_CMDS
- $(MAKE) \
- $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_MAKE_ENV) $(MAKE) \
-C $(@D) all
endef