X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/94874fca43d54e83c73814cc70f1d31fc01ed8c4..5ece0782781b924c1c5e972fbbce18cde3fc19ce:/openwrt/package/openldap/Makefile

diff --git a/openwrt/package/openldap/Makefile b/openwrt/package/openldap/Makefile
index 5ca37c9d5..5909ee530 100644
--- a/openwrt/package/openldap/Makefile
+++ b/openwrt/package/openldap/Makefile
@@ -3,13 +3,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
-PKG_VERSION:=2.2.26
+PKG_VERSION:=2.2.29
 PKG_RELEASE:=1
-PKG_MD5SUM:=afc8700b5738da863b30208e1d3e9de8
+PKG_MD5SUM:=6c4c72a1336aa45b463e738034c078d6
 
-PKG_SOURCE_URL:= \
-	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
+	ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
+	ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
+	ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_CAT:=zcat
 
@@ -36,10 +37,12 @@ include $(TOPDIR)/package/rules.mk
 $(eval $(call PKG_template,LIBOPENLDAP,libopenldap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-	touch $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		./configure \
 		  --target=$(GNU_HOST_NAME) \
@@ -61,6 +64,9 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		  $(DISABLE_LARGEFILE) \
 		  $(DISABLE_NLS) \
 		  $(PKG_CONFIGURE_OPTIONS) \
+		  --without-cyrus-sasl \
+		  --without-threads \
+		  --without-tls \
 	)
 	$(MAKE) -C $(PKG_BUILD_DIR) depend 
 	$(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblutil
@@ -72,7 +78,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		ac_cv_func_memcmp_clean="yes" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
@@ -95,12 +101,10 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		  $(DISABLE_NLS) \
 		  $(PKG_CONFIGURE_OPTIONS) \
 	)
-	$(MAKE) -C $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $(PKG_BUILD_DIR)/.built
+		all install
+	touch $@
 	
 
 $(IPKG_LIBOPENLDAP):
@@ -124,7 +128,7 @@ $(STAGING_DIR)/usr/lib/libldap.so: $(PKG_BUILD_DIR)/.built
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib/
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $(STAGING_DIR)/usr/lib/libldap.so
+	touch $@
 	
 install-dev: $(STAGING_DIR)/usr/lib/libldap.so
 
@@ -132,5 +136,5 @@ uninstall-dev:
 	rm -rf $(STAGING_DIR)/usr/include/{lber,ldap}*.h
 	rm -rf $(STAGING_DIR)/usr/lib/lib{lber,ldap}*.{a,so*}
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev