From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 6 Jun 2016 14:35:15 +0000 (+0200)
Subject: openldap: forcibly disable ICU support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0080543e50dba525572915d31bc8b7709eb69100;p=feed%2Fpackages.git

openldap: forcibly disable ICU support

When openldap-server is built within an environment where ICU has been
previously built, the package will pick up this unintended dependency and
fail with the following error:

    Package openldap-server is missing dependencies for the following libraries:
    libicudata.so.55
    libicuuc.so.55
    Makefile:148: recipe for target '.../openldap-server_2.4.43-2_mips_34kc.ipk' failed

Since the ICU libraries are extremely big (~12MB) we cannot simply depend on
them so add the necessary autoconfig cache variable to let the ICU presence
test fail in order to inhibit linking against those libraries.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index f9a8347720..b3cbfacfd3 100644
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
 PKG_VERSION:=2.4.43
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
@@ -102,6 +102,9 @@ CONFIGURE_ARGS += \
 	--disable-monitor \
 	--disable-relay
 
+CONFIGURE_VARS += \
+	ol_cv_lib_icu="no"
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \