openssl: Don't ship an SSE-optimised version of libssl

[ipfire-2.x.git] / lfs / openssl

diff --git a/lfs/openssl b/lfs/openssl
index 699f3603dc7b93364798ad790bf3ea6644621f16..d8925d7d18538532a19c2706e4f448ffa3675147 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -31,13 +31,18 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-ifeq "$(SSE2)" "1"
-       TARGET = $(DIR_INFO)/$(THISAPP)-sse2
+TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG)
+
+ifneq "$(KCFG)" "-sse2"
+CFLAGS += -DPURIFY
 else
-       TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS =-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC
+CFLAGS+= -fstack-protector-all --param=ssp-buffer-size=4
+CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse
+CFLAGS+= -fomit-frame-pointer -DPURIFY
+CXXFLAGS="${CFLAGS}"
 endif
 
-CFLAGS += -DPURIFY
 export RPM_OPT_FLAGS = $(CFLAGS)
 
 CONFIGURE_OPTIONS = \
@@ -60,7 +65,7 @@ CONFIGURE_OPTIONS = \
 ifeq "$(MACHINE)" "i586"
        CONFIGURE_OPTIONS += linux-elf
 
-ifneq "$(SSE2)" "1"
+ifneq "$(KCFG)" "-sse2"
        CONFIGURE_OPTIONS += no-sse2
 endif
 endif
@@ -112,6 +117,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1m-weak-ciphers.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch
 
+       # Enable Padlock in i586
+ifeq "$(MACHINE)" "i586"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
+endif
+
        # Apply our CFLAGS
        cd $(DIR_APP) && sed -i Configure \
                -e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"
@@ -124,10 +134,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make depend
        cd $(DIR_APP) && make
 
-ifeq "$(SSE2)" "1"
+ifeq "$(KCFG)" "-sse2"
        -mkdir -pv /usr/lib/sse2
        cd $(DIR_APP) && install -m 755 \
-               libcrypto.so.10 libssl.so.10 /usr/lib/sse2
+               libcrypto.so.10 /usr/lib/sse2
 else
        # Install everything.
        cd $(DIR_APP) && make install