[tor-commits] [torbrowser/maint-2.3] Apply the openssl OSX patch in unpack target

[erinn at torproject.org]

commit 9e786aeed3ae6c3b664bd4fad091b23a118721c3
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Tue Feb 21 10:49:15 2012 +0100

    Apply the openssl OSX patch in unpack target
    
    This means we now also apply the patch for linux and windows, but that
    should be fine - it doesn't touch files they need. This means for us
    that if the build fails and we have to re-run the build-openssl target
    with a changed configuration or so, we can without re-extracting.
---
 build-scripts/osx.mk      |    3 ---
 build-scripts/versions.mk |    5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 160c9dd..34705bc 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -57,9 +57,6 @@ build-zlib: $(ZLIB_DIR)
 
 OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib $(BACKWARDS_COMPAT) --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include
 build-openssl: build-zlib $(OPENSSL_DIR)
-	cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR)
-	cp patch-any-src.sh $(OPENSSL_DIR)
-	cd $(OPENSSL_DIR) && ./patch-any-src.sh
 ifeq (x86_64,$(ARCH_TYPE))
 	cd $(OPENSSL_DIR) && ./Configure darwin64-x86_64-cc $(OPENSSL_OPTS)
 else
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 0aafa30..a89bf13 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -168,9 +168,12 @@ $(QT_DIR): $(FETCH_DIR)/$(QT_PACKAGE) | $(BUILD_DIR)
 	cd $(FETCH_DIR) && tar -xmf $(QT_PACKAGE) -C $(BUILD_DIR)/
 	mv $(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VER) $(QT_DIR)
 
-$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) | $(BUILD_DIR)
+$(OPENSSL_DIR): $(FETCH_DIR)/$(OPENSSL_PACKAGE) ../src/current-patches/openssl/*patch | $(BUILD_DIR)
 	rm -rf $(OPENSSL_DIR)
 	cd $(FETCH_DIR) && tar -xmf $(OPENSSL_PACKAGE) -C $(BUILD_DIR)/
+	cp ../src/current-patches/openssl/*patch $(OPENSSL_DIR)
+	cp patch-any-src.sh $(OPENSSL_DIR)
+	cd $(OPENSSL_DIR) && ./patch-any-src.sh
 
 $(VIDALIA_DIR): $(FETCH_DIR)/$(VIDALIA_PACKAGE) | $(BUILD_DIR)
 	rm -rf $(VIDALIA_DIR)