From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 16 Feb 2021 17:43:12 +0000 (+0000)
Subject: gmp: Drop SSE2-optimized version on i586
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a810c2ae8f5f2a77303bca7c5f896297c48b4ca0;p=people%2Fms%2Fipfire-2.x.git

gmp: Drop SSE2-optimized version on i586

The next version of glibc has removed support for this and this patch
removes it.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp
deleted file mode 100644
index c1d6a7d9d0..0000000000
--- a/config/rootfiles/common/armv5tel/gmp
+++ /dev/null
@@ -1,17 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.4.0
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.6.0
-#usr/lib/pkgconfig/gmp.pc
-#usr/lib/pkgconfig/gmpxx.pc
-#usr/share/info/gmp.info
-#usr/share/info/gmp.info-1
-#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/aarch64/gmp b/config/rootfiles/common/gmp
similarity index 100%
rename from config/rootfiles/common/aarch64/gmp
rename to config/rootfiles/common/gmp
diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp
deleted file mode 100644
index c0ec9a9b64..0000000000
--- a/config/rootfiles/common/i586/gmp
+++ /dev/null
@@ -1,19 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.4.0
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.6.0
-#usr/lib/pkgconfig/gmp.pc
-#usr/lib/pkgconfig/gmpxx.pc
-usr/lib/sse2/libgmp.so.10
-usr/lib/sse2/libgmp.so.10.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/x86_64/gmp b/config/rootfiles/common/x86_64/gmp
deleted file mode 100644
index c1d6a7d9d0..0000000000
--- a/config/rootfiles/common/x86_64/gmp
+++ /dev/null
@@ -1,17 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.4.0
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.6.0
-#usr/lib/pkgconfig/gmp.pc
-#usr/lib/pkgconfig/gmpxx.pc
-#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 d091009813..ed92cf30e6 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -34,13 +34,8 @@ 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
 ###############################################################################
@@ -82,26 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && \
 		$(CONFIGURE_ARGS) \
 		./configure \
-			--build=$(BUILDTARGET) \
-			$(CONFIGURE_OPTIONS)
+			--prefix=/usr \
+			--enable-cxx
 	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.4.0 /usr/lib/sse2
-endif
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)