Fix build on non-SMP machines of the remote GDB debugging (#2666)

[openwrt.git] / package / gmp / Makefile

diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 5a58f8f..aff46a9 100644 (file)
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmp
-PKG_VERSION:=4.1.4
+PKG_VERSION:=4.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/gmp
-PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=091c56e0e1cca6b09b17b69d47ef18e3
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,13 +25,10 @@ define Package/libgmp
   URL:=http://www.swox.com/gmp/
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static, \
-               CC="$(TARGET_CROSS)gcc" \
-       )
-endef
+CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
 
 define Build/Compile
        $(call Build/Compile/Default, \
@@ -46,15 +39,15 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(1)/usr/lib/
 endef
 
 define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/gmp* \
-               $(STAGING_DIR)/usr/lib/libgmp.{a,so*}
+       rm -rf  $(1)/usr/include/gmp* \
+               $(1)/usr/lib/libgmp.{a,so*}
 endef
 
 define Package/libgmp/install