X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgmp;h=b2d0ada15bbc58f2556eb338d97405f5e1710056;hb=addeeb1f79825fdf2e03c089d661686050b336d5;hp=780e7f69df9dfb824489f2bd72387fbb0d0bb3ab;hpb=10cd52ba8e0f1c44666cd4a2bf9845c4e783a238;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/gmp b/lfs/gmp
index 780e7f69df..b2d0ada15b 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,25 +24,18 @@
 
 include Config
 
-VER        = 6.0.0
+VER        = 6.2.1
 
 THISAPP    = gmp-$(VER)
-DL_FILE    = $(THISAPP)a.tar.xz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
 	CONFIGURE_ARGS = ABI=32
-	BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET))
 endif
 
-CONFIGURE_OPTIONS = \
-	--prefix=/usr \
-	--enable-cxx \
-	--enable-mpbsd \
-	--disable-nls
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -51,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1e6da4e434553d2811437aa42c7f7c76
+$(DL_FILE)_MD5 = 0b82665c4a92fd2ade7440c13fcaa42b
 
 install : $(TARGET)
 
@@ -84,26 +77,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && \
 		$(CONFIGURE_ARGS) \
 		./configure \
-			--build=$(BUILDTARGET) \
-			$(CONFIGURE_OPTIONS)
+			--build=${BUILDTARGET} \
+			--prefix=/usr \
+			--enable-cxx
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-
-ifeq "$(MACHINE)" "i586"
-	# Build SSE/SSE2 optimised version for x86
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && \
-		$(CONFIGURE_ARGS) \
-		./configure \
-			--build=$(BUILDTARGET_PENTIUM4) \
-			$(CONFIGURE_OPTIONS) \
-			CFLAGS="$(CFLAGS) -march=pentium4" \
-			CXXFLAGS="$(CXXFLAGS) -march=pentium4"
-	cd $(DIR_APP) && make $(MAKETUNING)
-
-	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.2.0 /usr/lib/sse2
-endif
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)