From 6feb11ed576a1125ae8c90e8ba7ff784dbb90a7e Mon Sep 17 00:00:00 2001
From: Georg Koppen <georg@getfoxyproxy.org>
Date: Sat, 12 Oct 2013 16:55:58 +0200
Subject: [PATCH] crosstool-ng patch
---
gitian/descriptors/mac/gitian-firefox.yml | 37 ++++++++++++++++++++++++-----
gitian/fetch-inputs.sh | 1 +
gitian/mkbundle-mac.sh | 2 +-
gitian/versions | 1 +
4 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml
index 8a683aa..bfa9339 100644
a
|
b
|
packages: |
12 | 12 | - "autoconf2.13" |
13 | 13 | - "faketime" |
14 | 14 | - "yasm" |
| 15 | - "binutils-gold" |
| 16 | - "gperf" |
| 17 | - "bison" |
| 18 | - "flex" |
| 19 | - "texinfo" |
| 20 | - "gawk" |
| 21 | - "automake" |
| 22 | - "libtool" |
| 23 | - "libncurses5-dev" |
| 24 | - "groff" |
15 | 25 | #- "libssl0.9.8" |
16 | 26 | reference_datetime: "2000-01-01 00:00:00" |
17 | 27 | remotes: |
18 | 28 | - "url": "https://git.torproject.org/tor-browser.git" |
19 | 29 | "dir": "tor-browser" |
| 30 | - "url": "https://github.com/diorcety/crosstool-ng.git" |
| 31 | "dir": "crosstool-ng" |
20 | 32 | files: |
21 | 33 | - "torbrowser.version" |
22 | 34 | - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" |
23 | | - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" |
| 35 | #- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" |
24 | 36 | - "i686-apple-darwin11-gcc" |
25 | 37 | - "i686-apple-darwin11-g++" |
26 | 38 | - "i686-apple-darwin11-ld" |
27 | 39 | - "re-dzip.sh" |
28 | 40 | - "dzip.sh" |
| 41 | - "crosstool.config" |
29 | 42 | #- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" |
30 | 43 | #- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" |
31 | 44 | script: | |
… |
… |
script: | |
33 | 46 | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 |
34 | 47 | export FAKETIME=$REFERENCE_DATETIME |
35 | 48 | export TZ=UTC |
36 | | export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" |
37 | | export CXXFLAGS=$CFLAGS |
38 | | export LDFLAGS=$CFLAGS |
39 | 49 | export PATH="$PATH:/usr/apple-osx/bin/" |
40 | 50 | export LC_ALL=C |
41 | 51 | umask 0022 |
… |
… |
script: | |
46 | 56 | sudo dpkg -i *.deb |
47 | 57 | chmod 755 i686* |
48 | 58 | sudo cp i686* /usr/bin/ |
49 | | cd /usr |
50 | | sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz |
| 59 | #cd /usr |
| 60 | #sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz |
| 61 | cd crosstool-ng |
| 62 | autoconf |
| 63 | ./configure --prefix=/usr/local |
| 64 | ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk $HOME/MacOSX10.6.sdk |
| 65 | sudo make install |
| 66 | export PATH="$PATH:/usr/local/ct-ng-build" |
| 67 | sudo cp -f ../crosstool.config /usr/local/lib/ct-ng.hg*/samples/i686-apple-darwin11 |
| 68 | mkdir ct-ng-final |
| 69 | cd ct-ng-final |
| 70 | ct-ng i686-apple-darwin11 |
| 71 | ct-ng build |
| 72 | # |
51 | 73 | cd ~/build |
| 74 | export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" |
| 75 | export CXXFLAGS=$CFLAGS |
| 76 | export LDFLAGS=$CFLAGS |
52 | 77 | # FIXME: path hacks: |
53 | 78 | sudo mkdir -p /System/Library/ |
54 | 79 | sudo ln -s /usr/apple-osx/bin/i686-apple-darwin11-otool /usr/bin/otool |
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index cce3331..99597b0 100755
a
|
b
|
tor https://git.torproject.org/tor.git |
229 | 229 | torbutton https://git.torproject.org/torbutton.git |
230 | 230 | https-everywhere https://git.torproject.org/https-everywhere.git |
231 | 231 | tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG |
| 232 | crosstool-ng https://github.com/diorcety/crosstool-ng.git |
232 | 233 | EOF |
233 | 234 | |
234 | 235 | exit 0 |
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index 6ca7e49..8f8eb84 100755
a
|
b
|
then |
89 | 89 | echo "****** Starting TorBrowser Component of Mac Bundle (2/3 for Mac) ******" |
90 | 90 | echo |
91 | 91 | |
92 | | ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/mac/gitian-firefox.yml |
| 92 | ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG,crosstool-ng=${CROSSTOOL_NG_TAG} $DESCRIPTOR_DIR/mac/gitian-firefox.yml |
93 | 93 | if [ $? -ne 0 ]; |
94 | 94 | then |
95 | 95 | #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` |
diff --git a/gitian/versions b/gitian/versions
index c601dc1..1c5c411 100755
a
|
b
|
NSIS_TAG=v0.1 |
12 | 12 | ZLIB_TAG=v1.2.8 |
13 | 13 | LIBEVENT_TAG=release-2.0.21-stable |
14 | 14 | MINGW_REV=5830 |
| 15 | CROSSTOOL_NG_TAG=test5 |
15 | 16 | |
16 | 17 | GITIAN_TAG=tor-browser-builder-3.0-4 |
17 | 18 | |