commit 1dbc75556c4dac73438338d2c9267fe084e724af Author: Nicolas Vigier boklm@torproject.org Date: Mon Apr 3 16:13:05 2017 +0200

Bug 21328: Updating to clang 3.8.0

We use the new compiler Mozilla is using for Firefox 52 cross-builds as well. clang now requires GCC 4.8.5 for compiling which is not available in Debian Wheezy. We therefore build the macOS parts on Debian Jessie now. --- keyring/llvm.gpg | Bin 0 -> 2507 bytes projects/clang/build | 8 -------- projects/clang/config | 5 ----- projects/llvm/build | 15 ++++++++++++--- projects/llvm/config | 30 +++++++++++++++++++++++++----- projects/tor/build | 2 +- rbm.conf | 2 +- 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/keyring/llvm.gpg differ diff --git a/projects/clang/build b/projects/clang/build deleted file mode 100644 index ac0f21b..0000000 --- a/projects/clang/build +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/clang/config b/projects/clang/config deleted file mode 100644 index 92b8d51..0000000 --- a/projects/clang/config +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -version: r247539 -git_url: https://github.com/llvm-mirror/clang -git_hash: 592b43b609b42cffd1531a700c140e10766bf049 -filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/llvm/build b/projects/llvm/build index 3773cfd..5241944 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -5,10 +5,19 @@ mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c("version") %] +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/cfe') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +mv cfe-* clang +mv libcxx-* libcxx +mv libcxxabi-* libcxxabi +mv clang llvm-*/tools +mv libcxx llvm-*/projects +mv libcxxabi llvm-*/projects +cd llvm-* export LLVM_HOME=$(pwd) -tar -C $LLVM_HOME/tools -xf $rootdir/[% c('input_files_by_name/clang') %] mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME diff --git a/projects/llvm/config b/projects/llvm/config index 89ee637..81f7aaa 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -1,7 +1,5 @@ # vim: filetype=yaml sw=2 -version: 8f188e0ea735ac9383a65a0d1c846eb790c2ec74 -git_url: https://github.com/llvm-mirror/llvm -git_hash: '[% c("version") %]' +version: 3.8.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1

@@ -9,5 +7,27 @@ input_files: - project: docker-image - project: cmake name: cmake - - project: clang - name: clang + - URL: 'http://releases.llvm.org/%5B% c("version") %]/llvm-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: llvm + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/%5B% c("version") %]/cfe-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: cfe + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/%5B% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: libcxx + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/%5B% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: libcxxabi + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg diff --git a/projects/tor/build b/projects/tor/build index c56cddc..064ff44 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -61,7 +61,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/rbm.conf b/rbm.conf index 868c30a..d7c8b34 100644 --- a/rbm.conf +++ b/rbm.conf @@ -166,7 +166,7 @@ targets: torbrowser-osx-x86_64: - osx-x86_64 osx-x86_64: - distribution: Debian-7.11 + distribution: Debian-8.7 arch: x86_64 var: osx: 1