[tor-bugs] #8246 [Tor bundles/installation]: build TBB on 10.8.2
Tor Bug Tracker & Wiki
blackhole at torproject.org
Sat Feb 16 12:04:15 UTC 2013
#8246: build TBB on 10.8.2
--------------------------------------+-------------------------------------
Reporter: ioerror | Owner: erinn
Type: defect | Status: new
Priority: normal | Milestone:
Component: Tor bundles/installation | Version:
Keywords: | Parent:
Points: | Actualpoints:
--------------------------------------+-------------------------------------
Comment(by cypherpunks):
This is the diff I used to get past the QT build errors:
{{{
diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-
scripts/config/mozconfig-osx-i386
index 57f943d..66be1cc 100644
--- a/build-scripts/config/mozconfig-osx-i386
+++ b/build-scripts/config/mozconfig-osx-i386
@@ -19,7 +19,7 @@ CROSS_COMPILE=1
ac_add_options --target=i386-apple-darwin$DARWIN_VERSION
# Options for 'configure' (same as command-line options).
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
+ac_add_options --with-macos-
sdk=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/
ac_add_options --enable-macos-target=10.5
ac_add_options --enable-application=browser
ac_add_options --enable-official-branding
diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-
scripts/config/mozconfig-osx-x86_64
index 8136100..ae985b7 100755
--- a/build-scripts/config/mozconfig-osx-x86_64
+++ b/build-scripts/config/mozconfig-osx-x86_64
@@ -18,7 +18,7 @@ mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON)
$(MOZ_OBJDIR)/_profile/pgo/profiles
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.6.sdk
+ac_add_options --with-macos-
sdk=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/
ac_add_options --target=x86_64-apple-darwin10.6.0
ac_add_options --enable-macos-target=10.6
# bug 491774. crashreporter won't build in cross compile
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 95dc973..eb44787 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -22,7 +22,7 @@ PLATFORM=MacOS
OSX_VERSION=10.5
CC=
# These can probably be left alone for OSX_VERSION 10.5 and up
-SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk
+SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/
SDK=-sdk $(SDK_PATH)
MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION)
CF_MIN_VERSION=-isysroot $(SDK_PATH)
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index f420e46..b6dc0fb 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -22,7 +22,7 @@ PLATFORM=MacOS
OSX_VERSION=10.5
CC=
# These can probably be left alone for OSX_VERSION 10.5 and up
-SDK_PATH=/Developer/SDKs/MacOSX10.6.sdk
+SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/
SDK=-sdk $(SDK_PATH)
MIN_VERSION=-mmacosx-version-min=$(OSX_VERSION)
CF_MIN_VERSION=-isysroot $(SDK_PATH)
@@ -31,7 +31,7 @@ BACKWARDS_COMPAT=$(MIN_VERSION) $(CF_MIN_VERSION)
$(LD_MIN_VERSION)
## Build machine specific settings
# Number of cpu cores used to build in parallel
-NUM_CORES=4
+NUM_CORES=1
## Location of directory for source fetching
FETCH_DIR=$(PWD)/build
@@ -67,7 +67,8 @@ endif
QT_BUILD_PREFS=-system-zlib -confirm-license -opensource -openssl-linked
-no-qt3support \
- -fast -release -no-webkit -no-framework -nomake demos -nomake
examples $(SDK) -arch $(ARCH_TYPE)
+ -fast -release -no-webkit -no-framework -nomake demos -nomake
examples -arch $(ARCH_TYPE)
+# -fast -release -no-webkit -no-framework -nomake demos -nomake
examples $(SDK) -arch $(ARCH_TYPE)
QT_OPTS=$(QT_BUILD_PREFS) -prefix $(BUILT_DIR) -I $(BUILT_DIR)/include -I
$(BUILT_DIR)/include/openssl/ -L $(BUILT_DIR)/lib
build-qt: build-zlib build-openssl $(QT_DIR)
cd $(QT_DIR) && ./configure $(QT_OPTS)
diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk
index 138b28d..eb01edf 100644
--- a/build-scripts/versions.mk
+++ b/build-scripts/versions.mk
@@ -43,7 +43,8 @@ OBFSPROXY_PACKAGE=obfsproxy-$(OBFSPROXY_VER).tar.gz
ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE)
OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE)
LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE)
-QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
+#QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE)
+QT_URL=https://people.torproject.org/~ioerror/src/mirrors/$(QT_PACKAGE)
VIDALIA_URL=https://archive.torproject.org/tor-package-
archive/vidalia/$(VIDALIA_PACKAGE)
LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACKAGE)
TOR_URL=https://archive.torproject.org/tor-package-archive/$(TOR_PACKAGE)
diff --git a/docs/buildmachine_setups/osx.txt
b/docs/buildmachine_setups/osx.txt
index 7093859..db141a8 100644
--- a/docs/buildmachine_setups/osx.txt
+++ b/docs/buildmachine_setups/osx.txt
@@ -31,7 +31,7 @@ Then run these:
cd /builds/
git clone https://git.torproject.org/torbrowser
cd torbrowser
- git checkout maint-2.2
+ git checkout maint-2.4
cd build-scripts
make -f osx.mk build-all-binaries copy-firefox bundle
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/8246#comment:7>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list