fix build on systems without libgcrypt-config

[openwrt.git] / package / openldap / Makefile

diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index f89c1e8..5909ee5 100644 (file)
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -3,11 +3,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openldap

-PKG_VERSION:=2.2.26
+PKG_VERSION:=2.2.29

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=afc8700b5738da863b30208e1d3e9de8
+PKG_MD5SUM:=6c4c72a1336aa45b463e738034c078d6

 
 

-PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+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
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_CAT:=zcat
 


@@ -61,6 +64,9 @@ $(PKG_BUILD_DIR)/.built:
                  $(DISABLE_LARGEFILE) \
                  $(DISABLE_NLS) \
                  $(PKG_CONFIGURE_OPTIONS) \
                  $(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
        )
        $(MAKE) -C $(PKG_BUILD_DIR) depend 
        $(MAKE) -C $(PKG_BUILD_DIR)/libraries/liblutil


@@ -72,7 +78,7 @@ $(PKG_BUILD_DIR)/.built:
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                $(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) \
                ac_cv_func_memcmp_clean="yes" \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \


@@ -122,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/
        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
 
        
 install-dev: $(STAGING_DIR)/usr/lib/libldap.so
 


@@ -130,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*}
 
        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