toolchain: fix full toolchain crossbuild

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

diff --git a/lfs/openssl b/lfs/openssl
index d8925d7d18538532a19c2706e4f448ffa3675147..1dc24ac2a6922be3e8dfdce8a97b99a8e3653b55 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2a
+VER        = 1.0.2e
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -62,6 +62,10 @@ CONFIGURE_OPTIONS = \
        no-srp \
        -DSSL_FORBID_ENULL
 
+ifeq "$(MACHINE)" "x86_64"
+       CONFIGURE_OPTIONS += linux-x86_64
+endif
+
 ifeq "$(MACHINE)" "i586"
        CONFIGURE_OPTIONS += linux-elf
 
@@ -82,7 +86,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a06c547dac9044161a477211049f60ef
+$(DL_FILE)_MD5 = 2218c1a6f807f7206c11eb3ee3a5ec80
 
 install : $(TARGET)
 
@@ -117,11 +121,16 @@ $(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
+       # i586 specific patches
 ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch
 endif
 
+       # With openssl 1.0.2e, pod2mantest is missing
+       echo -e "#!/bin/bash\necho \$$(which pod2man)" > $(DIR_APP)/util/pod2mantest
+       chmod a+x $(DIR_APP)/util/pod2mantest
+
        # Apply our CFLAGS
        cd $(DIR_APP) && sed -i Configure \
                -e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"