openssl: Apply ciphers patch before running Configure

This works just fine here.

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

diff --git a/lfs/openssl b/lfs/openssl
index 6e17e79e69fc32a2a30c4b72bd27aec280d871bd..7a39f14de610a2af7d1ced3ca2e30fd09cb20645 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -120,6 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0-disable-ssl3.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0g-weak-ciphers.patch
 
        # Apply our CFLAGS
        cd $(DIR_APP) && sed -i Configure \
@@ -131,9 +132,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS) \
                $(CFLAGS) $(LDFLAGS)
 
-       # Apply patch for changing DEFAULT cipher list (needed after configure)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.1.0g-weak-ciphers.patch
-
        cd $(DIR_APP) && make depend
        cd $(DIR_APP) && make