[tor-commits] [torbrowser/maint-2.3] add openssl patch that allows it to build with a 10.5 SDK

[erinn at torproject.org]

commit 75661153f23556f4303522f3d569ececba83af50
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Feb 3 00:51:19 2012 +0100

    add openssl patch that allows it to build with a 10.5 SDK
---
 build-scripts/osx.mk                               |    3 ++
 .../openssl/0001-Build-OpenSSL-with-10.5-SDK.patch |   35 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index a06200d..4a13151 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -59,6 +59,9 @@ build-zlib:
 OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER)
 OPENSSL_OPTS=-no-rc5 -no-md2 -no-man shared zlib -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -I$(BUILT_DIR)/include
 build-openssl:
+	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/src/current-patches/openssl/0001-Build-OpenSSL-with-10.5-SDK.patch b/src/current-patches/openssl/0001-Build-OpenSSL-with-10.5-SDK.patch
new file mode 100644
index 0000000..b3ba7d9
--- /dev/null
+++ b/src/current-patches/openssl/0001-Build-OpenSSL-with-10.5-SDK.patch
@@ -0,0 +1,35 @@
+From e966e8ee358c4dff1aa25a71af72c215ec3f2d4a Mon Sep 17 00:00:00 2001
+From: Erinn Clark <erinn at torproject.org>
+Date: Fri, 6 Jan 2012 16:06:55 +0100
+Subject: [PATCH] Make it possible to build OpenSSL on OS X with a 10.5 SDK
+
+---
+ Configure |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/Configure b/Configure
+index 7941c93..d70b6eb 100755
+--- a/Configure
++++ b/Configure
+@@ -816,7 +816,7 @@ PROCESS_ARGS:
+ 			}
+ 		elsif (/^[-+]/)
+ 			{
+-			if (/^-[lL](.*)$/ or /^-Wl,/)
++			if (/^-[lL](.*)$/ or /^-Wl,/ or /^-isysroot/)
+ 				{
+ 				$libs.=$_." ";
+ 				}
+@@ -867,6 +867,9 @@ PROCESS_ARGS:
+ 			eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string
+ 			$target=$1;
+ 			}
++		elsif (/^\//) {
++		    $libs .= $_." ";
++		}
+ 		else
+ 			{
+ 			die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
+-- 
+1.7.7.4
+