[tor-commits] [tor-messenger-build/master] Update Mac OS X SDK

[boklm@xxxxxxxxxxxxxx]

commit cdccd9f3968029d140f5d59ce70840c4200d0be5
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Wed Jun 24 14:40:18 2015 +0200

    Update Mac OS X SDK
    
    Same as Tor Browser:
    https://gitweb.torproject.org/builders/tor-browser-bundle.git/commit/?id=ff23e83bcc9e5ade5fcbf954c449446c4044df78
---
 projects/macosx-toolchain/build  |    5 ++---
 projects/macosx-toolchain/config |   11 ++++++-----
 rbm.conf                         |    3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build
index 44e51ec..c22d8f8 100644
--- a/projects/macosx-toolchain/build
+++ b/projects/macosx-toolchain/build
@@ -3,9 +3,8 @@ set -e
 rootdir=$(pwd)
 distdir="$rootdir/dist/[% project %]"
 mkdir -p "$distdir"
-ar vx [% c('input_files_by_name/SDK') %]
-tar xzf data.tar.gz
-mv usr/lib/apple/SDKs "$distdir/SDK"
+tar xzf [% c('input_files_by_name/SDK') %]
+mv MacOSX10.7.sdk "$distdir/SDK"
 tar xf [% c('input_files_by_name/clang') %]
 mv x-tools "$distdir"
 cd "$rootdir/dist"
diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config
index 5e9dcb2..19e2c5c 100644
--- a/projects/macosx-toolchain/config
+++ b/projects/macosx-toolchain/config
@@ -1,14 +1,15 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %].tar.gz'
-version: 1
+version: 10.7-1
 var:
   setup: |
     mkdir -p /var/tmp/dist
     tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %]
-    sysrootdir=/var/tmp/dist/[% project %]/SDK/MacOSX10.6.sdk/
+    sysrootdir=/var/tmp/dist/[% project %]/SDK/
     ccbindir=/var/tmp/dist/[% project %]/x-tools/x86_64-apple-darwin10/bin
     export PATH="$ccbindir:$PATH"
-    FLAGS="-arch x86_64 -isysroot $sysrootdir"
+    CFLAGS="-arch x86_64 -isysroot $sysrootdir"
+    CXXFLAGS="-arch x86_64 -isysroot $sysrootdir"
     CC="$ccbindir/x86_64-apple-darwin10-clang $FLAGS"
     CXX="$ccbindir/x86_64-apple-darwin10-clang++ $FLAGS"
     RANLIB=$ccbindir/x86_64-apple-darwin10-ranlib
@@ -27,5 +28,5 @@ input_files:
     URL: https://people.torproject.org/~mikeperry/mirrors/sources/x86_64-apple-darwin10.tar.xz
     sha256sum: 7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
   - name: SDK
-    URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
-    sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
+    URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar.gz
+    sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
diff --git a/rbm.conf b/rbm.conf
index 4e81508..91d46ac 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -69,8 +69,7 @@ targets:
       osx: 1
       osname: osx-x86_64
       compiler: 'macosx-toolchain'
-      configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/CLANG_FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/CLANG_FLAGS") %]"'
-      CLANG_FLAGS: '-arch x86_64 -isysroot /var/tmp/dist/macosx-toolchain/SDK/MacOSX10.6.sdk'
+      configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang $CFLAGS" CXX="x86_64-apple-darwin10-clang++ $CXXFLAGS"'
 
   tor-messenger:
     var:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits