openssl: Drop SSE2-optimized version

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

diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2
deleted file mode 100644 (file)
index d366bd4..0000000
--- a/config/rootfiles/common/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/sse2/libcrypto.so.1.1

diff --git a/config/rootfiles/core/155/filelists/i586/openssl-sse2 b/config/rootfiles/core/155/filelists/i586/openssl-sse2
deleted file mode 120000 (symlink)
index f424713..0000000
--- a/config/rootfiles/core/155/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file

diff --git a/lfs/openssl b/lfs/openssl
index ea7eff1350da54d2c5e20cee83bfdecc855baee8..a50d686f025c4944ac9d6a6a1703690899d67b0b 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -35,11 +35,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
 
 CFLAGS += -DPURIFY -Wa,--noexecstack
 
-# Enable SSE2 for this build
-ifeq "$(KCFG)" "-sse2"
-  CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
-endif
-
 export RPM_OPT_FLAGS = $(CFLAGS)
 
 CONFIGURE_OPTIONS = \
@@ -72,11 +67,7 @@ ifeq "$(BUILD_ARCH)" "x86_64"
 endif
 
 ifeq "$(BUILD_ARCH)" "i586"
-       OPENSSL_ARCH = linux-elf
-
-  ifneq "$(KCFG)" "-sse2"
-       OPENSSL_ARCH += no-sse2
-  endif
+       OPENSSL_ARCH = linux-elf no-sse2
 endif
 
 ###############################################################################
@@ -132,15 +123,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make depend
        cd $(DIR_APP) && make $(MAKETUNING)
 
-ifeq "$(KCFG)" "-sse2"
-       -mkdir -pv /usr/lib/sse2
-       cd $(DIR_APP) && install -m 755 \
-               libcrypto.so.1.1 /usr/lib/sse2
-else
-       # Install everything.
+       # Install everything
        cd $(DIR_APP) && make install
        install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
-endif
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index a0c71ce73763130022901002f9b40494e9bc2bc6..eb00087f698a5f228836b748e78ac5d0d4de7491 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1145,7 +1145,6 @@ buildipfire() {
   lfsmake2 initscripts
   lfsmake2 backup
   lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 kmod
   lfsmake2 udev
   lfsmake2 popt