[tor-bugs] #8246 [Tor bundles/installation]: build TBB on 10.8.2

Tor Bug Tracker & Wiki blackhole at torproject.org
Sat Feb 16 06:29:26 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):

 Updated patch:

 {{{

 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..a26750b 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)
 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:2>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list