diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-02 21:25:00 +0100 |
| commit | 28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch) | |
| tree | fe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/iputils | |
| parent | 13222c07293becaefc69c46c8f90b04ddc7023d9 (diff) | |
| parent | 2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/iputils')
| -rw-r--r-- | package/iputils/Config.in | 1 | ||||
| -rw-r--r-- | package/iputils/iputils.hash | 2 | ||||
| -rw-r--r-- | package/iputils/iputils.mk | 24 |
3 files changed, 23 insertions, 4 deletions
diff --git a/package/iputils/Config.in b/package/iputils/Config.in index 40580d236..c83e414cc 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_IPUTILS bool "iputils" - select BR2_PACKAGE_OPENSSL depends on BR2_USE_MMU # fork() help This package is set of small useful utilities for Linux networking. diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index e32e13411..1cd8ed3ed 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 0e98cb527fa175d1e08afb969c124e452b30968f10ec2c3b078f1440c8977a94 iputils-c8ff6feaf0442f8efd96ccb415770c54f9e84d47.tar.gz +sha256 73de246aee1fd3cd69b1341a0c4e1b4acfa655fe6f7363fd9424824aa8bf5a57 iputils-3a86a2542c6fe29413c439bebeae11ec8a57ec7c.tar.gz diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 6392decfd..522be9b85 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,12 +11,11 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = c8ff6feaf0442f8efd96ccb415770c54f9e84d47 +IPUTILS_VERSION = 3a86a2542c6fe29413c439bebeae11ec8a57ec7c IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING -IPUTILS_DEPENDENCIES = openssl # Build after busybox so target ends up with this package's full # versions of the applications instead of busybox applets. @@ -34,6 +33,27 @@ else IPUTILS_MAKE_OPTS += USE_CAP=no endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +IPUTILS_MAKE_OPTS += USE_GCRYPT=yes +IPUTILS_DEPENDENCIES += libgcrypt +else +IPUTILS_MAKE_OPTS += USE_GCRYPT=no +endif + +ifeq ($(BR2_PACKAGE_NETTLE),y) +IPUTILS_MAKE_OPTS += USE_NETTLE=yes +IPUTILS_DEPENDENCIES += nettle +else +IPUTILS_MAKE_OPTS += USE_NETTLE=no +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +IPUTILS_MAKE_OPTS += USE_CRYPTO=yes +IPUTILS_DEPENDENCIES += openssl +else +IPUTILS_MAKE_OPTS += USE_CRYPTO=no +endif + define IPUTILS_BUILD_CMDS $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) endef |