[tor-commits] [torbrowser/maint-2.2] Make sure that tor links libraries statically

[erinn at torproject.org]

commit 38bc5784b70128fb0b611e25f3149bfe23989ede
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Mon Jan 17 23:56:45 2011 +0100

    Make sure that tor links libraries statically
    
    Fixes the TBB part of bug 2406
---
 README               |    3 +++
 build-scripts/osx.mk |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/README b/README
index 7085c52..9730ead 100644
--- a/README
+++ b/README
@@ -320,3 +320,6 @@ Changelog
 
 1.3.17: Released 2011-01-16
  Update Tor to 0.2.1.29
+
+1.3.18: Released 2011-??-??
+ Update the OS X makefile to make sure that tor links zlib, libevent and openssl statically. Fixes bug #2406.
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 47871d2..f5fd4de 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -148,7 +148,7 @@ build-libevent:
 TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER)
 TOR_CFLAGS="-O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386"
 TOR_LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
-TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0"
+TOR_OPTS=--enable-static-openssl --enable-static-zlib --enable-static-libevent --with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) CC="gcc-4.0"
 build-tor:
 	cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)
 	cd $(TOR_DIR) && make $(MAKEFLAGS)