From 3a07f5e4fe2543f8fbee4cdc680318bc426bd83d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 17 May 2015 13:42:34 +0200 Subject: [PATCH] ipmiutil: openssl is an optional dependency So handle it as such (it is only needed for the lanplus functionality). Signed-off-by: Peter Korsgaard --- package/ipmiutil/Config.in | 1 - package/ipmiutil/ipmiutil.mk | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/ipmiutil/Config.in b/package/ipmiutil/Config.in index 2500583095..a2a898b5c5 100644 --- a/package/ipmiutil/Config.in +++ b/package/ipmiutil/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_IPMIUTIL depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_x86_64 || BR2_i386 - select BR2_PACKAGE_OPENSSL help The ipmiutil package provides easy-to-use utilities to view the SEL, perform an IPMI chassis reset, set up the IPMI LAN diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index c7a8dd83be..f03ad9b394 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -10,10 +10,15 @@ IPMIUTIL_LICENSE = BSD-3c IPMIUTIL_LICENSE_FILES = COPYING # We're patching configure.ac IPMIUTIL_AUTORECONF = YES + +ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when # the openssl version is old, so force it off # SKIP_MD2 can be used only if ALLOW_GNU is defined. -IPMIUTIL_CONF_OPTS = CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2" -IPMIUTIL_DEPENDENCIES = openssl +IPMIUTIL_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2" +IPMIUTIL_DEPENDENCIES += openssl +else +IPMIUTIL_CONF_OPTS += --disable-lanplus +endif $(eval $(autotools-package)) -- 2.30.2