Kaynağa Gözat

package/iputils: removed dependency on openssl

iputils does not have to be built with openssl so remove selecting
BR2_PACKAGE_OPENSSL and make the dependency optional

Signed-off-by: Martin Bark <martin@barkynet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Martin Bark 9 yıl önce
ebeveyn
işleme
eae103ea24
2 değiştirilmiş dosya ile 7 ekleme ve 2 silme
  1. 0 1
      package/iputils/Config.in
  2. 7 1
      package/iputils/iputils.mk

+ 0 - 1
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.

+ 7 - 1
package/iputils/iputils.mk

@@ -16,7 +16,6 @@ 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,13 @@ else
 IPUTILS_MAKE_OPTS += USE_CAP=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