X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgmp;h=4d55e4f76253c29e675e6a8cfdf17a42ae6890ab;hb=2f6c9d93a3242fd648383c191ccb8d02271e89f7;hp=10cd28f1bad1d8e39ed6ad133ff31facc9427068;hpb=957578a20feaa8f085acd38358f5e74348aa711b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/gmp b/lfs/gmp
index 10cd28f1ba..4d55e4f762 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  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,14 +24,23 @@
 
 include Config
 
-VER        = 4.2.4
+VER        = 6.1.2
 
 THISAPP    = gmp-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+ifeq "$(BUILD_ARCH)" "i586"
+	CONFIGURE_ARGS = ABI=32
+	BUILDTARGET_PENTIUM4 = $(patsubst $(BUILD_ARCH)-%,pentium4-%,$(BUILDTARGET))
+endif
+
+CONFIGURE_OPTIONS = \
+	--prefix=/usr \
+	--enable-cxx
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fc1e3b3a2a5038d4d74138d0b9cf8dbe
+$(DL_FILE)_MD5 = f58fa8001d60c4c77595fbbb62b63c1d
 
 install : $(TARGET)
 
@@ -69,10 +78,30 @@ $(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
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && \
+		$(CONFIGURE_ARGS) \
+		./configure \
+			--build=$(BUILDTARGET) \
+			$(CONFIGURE_OPTIONS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+ifeq "$(BUILD_ARCH)" "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.3.2 /usr/lib/sse2
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)