From 45cd74d7085ec155284c81b9be02e20e156c3944 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 26 Jul 2014 22:09:20 +0200
Subject: [PATCH] gmp: Update to 6.0.0.

---
 config/rootfiles/common/armv5tel/gmp | 10 ++--------
 config/rootfiles/common/i586/gmp     | 14 +++-----------
 lfs/gmp                              | 11 +++++------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp
index 67f557fbb5..8f5ac559b3 100644
--- a/config/rootfiles/common/armv5tel/gmp
+++ b/config/rootfiles/common/armv5tel/gmp
@@ -1,21 +1,15 @@
 #usr/include/gmp.h
 #usr/include/gmpxx.h
-#usr/include/mp.h
 #usr/lib/libgmp.a
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.0.5
+usr/lib/libgmp.so.10.2.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.2.5
-#usr/lib/libmp.a
-#usr/lib/libmp.la
-#usr/lib/libmp.so
-usr/lib/libmp.so.3
-usr/lib/libmp.so.3.1.25
+usr/lib/libgmpxx.so.4.4.0
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp
index db6a0009c7..2de8123d1f 100644
--- a/config/rootfiles/common/i586/gmp
+++ b/config/rootfiles/common/i586/gmp
@@ -1,25 +1,17 @@
 #usr/include/gmp.h
 #usr/include/gmpxx.h
-#usr/include/mp.h
 #usr/lib/libgmp.a
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.0.5
+usr/lib/libgmp.so.10.2.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.2.5
-#usr/lib/libmp.a
-#usr/lib/libmp.la
-#usr/lib/libmp.so
-usr/lib/libmp.so.3
-usr/lib/libmp.so.3.1.25
+usr/lib/libgmpxx.so.4.4.0
 usr/lib/sse2/libgmp.so.10
-usr/lib/sse2/libgmp.so.10.0.5
-usr/lib/sse2/libmp.so.3
-usr/lib/sse2/libmp.so.3.1.25
+usr/lib/sse2/libgmp.so.10.2.0
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2
diff --git a/lfs/gmp b/lfs/gmp
index 1e518a2b3b..780e7f69df 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 5.0.5
+VER        = 6.0.0
 
 THISAPP    = gmp-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP)a.tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 041487d25e9c230b0c42b106361055fe
+$(DL_FILE)_MD5 = 1e6da4e434553d2811437aa42c7f7c76
 
 install : $(TARGET)
 
@@ -80,7 +80,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && \
 		$(CONFIGURE_ARGS) \
 		./configure \
@@ -102,8 +102,7 @@ ifeq "$(MACHINE)" "i586"
 	cd $(DIR_APP) && make $(MAKETUNING)
 
 	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.0.5 /usr/lib/sse2
-	cd $(DIR_APP) && install -v -m 755 .libs/libmp.so.3.1.25 /usr/lib/sse2
+	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.2.0 /usr/lib/sse2
 endif
 
 	@rm -rf $(DIR_APP)
-- 
2.39.2