[tor-commits] [tor-messenger-build/master] Update OS X build to use runc

[sukhbir at torproject.org]

commit 94ebf2d0de78151b8aaae9c815c047f0199d59ae
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Thu Jul 20 16:33:09 2017 -0400

    Update OS X build to use runc
---
 projects/cmake                   |  1 +
 projects/llvm                    |  1 +
 projects/macosx-toolchain        |  1 +
 projects/macosx-toolchain/build  | 14 --------------
 projects/macosx-toolchain/config | 27 ---------------------------
 projects/yasm                    |  1 +
 6 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/projects/cmake b/projects/cmake
new file mode 120000
index 0000000..6e43969
--- /dev/null
+++ b/projects/cmake
@@ -0,0 +1 @@
+../tor-browser-build/projects/cmake
\ No newline at end of file
diff --git a/projects/llvm b/projects/llvm
new file mode 120000
index 0000000..7ab866e
--- /dev/null
+++ b/projects/llvm
@@ -0,0 +1 @@
+../tor-browser-build/projects/llvm
\ No newline at end of file
diff --git a/projects/macosx-toolchain b/projects/macosx-toolchain
new file mode 120000
index 0000000..bb252c7
--- /dev/null
+++ b/projects/macosx-toolchain
@@ -0,0 +1 @@
+../tor-browser-build/projects/macosx-toolchain
\ No newline at end of file
diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build
deleted file mode 100644
index c22d8f8..0000000
--- a/projects/macosx-toolchain/build
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-rootdir=$(pwd)
-distdir="$rootdir/dist/[% project %]"
-mkdir -p "$distdir"
-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"
-[% c('tar', {
-   tar_src => [ project ],
-   tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
-}) %]
diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config
deleted file mode 100644
index 32b97e4..0000000
--- a/projects/macosx-toolchain/config
+++ /dev/null
@@ -1,27 +0,0 @@
-# vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %].tar.gz'
-version: 10.7-1
-var:
-  setup: |
-    mkdir -p /var/tmp/dist
-    tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %]
-    export sysrootdir=/var/tmp/dist/[% project %]/SDK/
-    export ccbindir=/var/tmp/dist/[% project %]/x-tools/x86_64-apple-darwin10/bin
-    export PATH="$ccbindir:$PATH"
-    CFLAGS="-arch x86_64 -isysroot $sysrootdir"
-    CXXFLAGS="-arch x86_64 -isysroot $sysrootdir"
-    CC="$ccbindir/x86_64-apple-darwin10-clang $CFLAGS"
-    CXX="$ccbindir/x86_64-apple-darwin10-clang++ $CFLAGS"
-    RANLIB=$ccbindir/x86_64-apple-darwin10-ranlib
-    AR=$ccbindir/x86_64-apple-darwin10-ar
-    AS=$ccbindir/x86_64-apple-darwin10-as
-    LD=$ccbindir/x86_64-apple-darwin10-ld
-    STRIP=$ccbindir/x86_64-apple-darwin10-strip
-
-input_files:
-  - name: clang
-    URL: https://people.torproject.org/~mikeperry/mirrors/sources/x86_64-apple-darwin10.tar.xz
-    sha256sum: 7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
-  - name: SDK
-    URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar.gz
-    sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
diff --git a/projects/yasm b/projects/yasm
new file mode 120000
index 0000000..599345e
--- /dev/null
+++ b/projects/yasm
@@ -0,0 +1 @@
+../tor-browser-build/projects/yasm
\ No newline at end of file