fix 2.4 build error introduced by changeset:2606

[openwrt.git] / openwrt / package / gmp / Makefile

diff --git a/openwrt/package/gmp/Makefile b/openwrt/package/gmp/Makefile
index 3a00229..27d9384 100644 (file)
--- a/openwrt/package/gmp/Makefile
+++ b/openwrt/package/gmp/Makefile
@@ -7,7 +7,7 @@ PKG_VERSION:=4.1.4
 PKG_RELEASE:=1
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
 
 PKG_RELEASE:=1
 PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
 

-PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/gmp/
+PKG_SOURCE_URL:=@GNU/gmp

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
 


@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \


@@ -47,7 +47,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $@
 
        );
        touch $@
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:

        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -64,15 +64,16 @@ $(IPKG_LIBGMP):
 $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/
 $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/

-       mkdir -p $(I_LIBPCAP_DEV)/usr/lib
+       mkdir -p $(STAGING_DIR)/usr/lib

        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/

-       touch $(STAGING_DIR)/usr/lib/libgmp.so
+       touch $@

 
 install-dev: $(STAGING_DIR)/usr/lib/libgmp.so
 
 uninstall-dev:
 
 install-dev: $(STAGING_DIR)/usr/lib/libgmp.so
 
 uninstall-dev:

-       rm -rf $(STAGING_DIR)/usr/include/gmp*
-       rm -rf $(STAGING_DIR)/usr/lib/libgmp.{a,so*}
+       rm -rf \
+               $(STAGING_DIR)/usr/include/gmp* \
+               $(STAGING_DIR)/usr/lib/libgmp.{a,so*} \

 
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev