Skip to content
Permalink
Browse files

[WIP] Bug 18331: Update OS X toolchain for ESR 45

  • Loading branch information...
arlolra committed Oct 7, 2016
1 parent 7591d3d commit 65d9353d2e083ec2aef4fe4616a3c80d4390dc68
BIN +16.5 KB keyring/cmake.gpg
Binary file not shown.
@@ -0,0 +1,3 @@
#!/bin/sh
set -e
distdir=$(pwd)/dist
@@ -0,0 +1,10 @@
# vim: filetype=yaml sw=2
version: v2.8.12.2
git_url: https://cmake.org/cmake.git
git_hash: '[% c("version") %]'
gpg_keyring: cmake.gpg
tag_gpg_id: 1
filename: '[% project %]-[% c("version") %].tar.gz'
remote_docker: 1
input_files:
- project: docker-image
@@ -5,10 +5,6 @@ export SHELL=/bin/sh
export HOME=$rootdir
export MOZ_BUILD_DATE=$(date -d @[% c('timestamp') %] +%Y%m%d%H%M%S)
export SOURCE_DATE_EPOCH=[% c('timestamp') %]
[% IF c('var/osx') -%]
[% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcchost') }) %]
ln -s /var/tmp/dist/gcc/bin/gcc /var/tmp/dist/gcc/bin/cc
[% END -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
mkdir -p /var/tmp/dist
cd /var/tmp/dist
@@ -139,9 +139,6 @@ input_files:
- name: binutils
project: binutils
enable: '[% c("var/linux") %]'
- name: gcchost
project: gcc
enable: '[% c("var/osx") %]'
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
- project: docker-image
@@ -19,9 +19,11 @@ var:
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: cmake
project: cmake
- name: cctools
URL: https://people.torproject.org/~gk/mirrors/sources/cctools.tar.gz
sha256sum: e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
- name: SDK
URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar.gz
sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
@@ -60,6 +60,6 @@ find . ! -executable -exec chmod 644 {} \;
find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt
find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelist.txt

mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755
genisoimage -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755
cd ..
dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]
@@ -49,7 +49,6 @@ targets:
arch_deps:
- nsis
osx-x86_64:
distribution: Ubuntu-12.04
var:
filename_ext: 'dmg'
arch_deps:
@@ -53,7 +53,7 @@ targets:
LDFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs'
compiler: mingw-w64
osx-x86_64:
distribution: Ubuntu-12.04
distribution: Debian-7.11
arch: x86_64
var:
osx: 1

0 comments on commit 65d9353

Please sign in to comment.
You can’t perform that action at this time.