Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...

[people/teissler/ipfire-2.x.git] / lfs / gmp

diff --git a/lfs/gmp b/lfs/gmp
index 10cd28f1bad1d8e39ed6ad133ff31facc9427068..cf5227671155965897c0bc8c6d3416fc287f4e62 100644 (file)
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.4
+VER        = 5.0.5
 
 THISAPP    = gmp-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,6 +32,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(MACHINE)" "i586"
+       CONFIGURE_ARGS = ABI=32
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fc1e3b3a2a5038d4d74138d0b9cf8dbe
+$(DL_FILE)_MD5 = 041487d25e9c230b0c42b106361055fe
 
 install : $(TARGET)
 
@@ -70,8 +74,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ABI=32 ./configure --prefix=/usr --enable-cxx \
-               --enable-mpbsd --disable-nls
+       cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
+               --enable-cxx --enable-mpbsd --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)