[tor-commits] [tor-browser-build/master] Bug 40003: Update cctools version for Firefox 78 ESR

[sysrqb at torproject.org]

commit 91375fb80f86bf849aee8bf5a76bb8ceee7c6180
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jul 9 19:48:49 2020 +0000

    Bug 40003: Update cctools version for Firefox 78 ESR
---
 projects/cctools/build  | 27 +++++++++++++++++++++------
 projects/cctools/config |  6 ++++--
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/projects/cctools/build b/projects/cctools/build
index a724399..b8d7523 100644
--- a/projects/cctools/build
+++ b/projects/cctools/build
@@ -1,20 +1,35 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
 distdir=/var/tmp/dist/[% project %]
-mkdir -p /var/tmp/dist
+mkdir -p $distdir
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]
-export PATH="/var/tmp/dist/clang/bin:$PATH"
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/libtapi') %]
+mv /var/tmp/dist/libtapi/* $distdir
+export CLANG_DIR=/var/tmp/dist/clang
 mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]/cctools
 
-export CC=clang
-export CXX=clang++
+export CC=$CLANG_DIR/bin/clang
+export CXX=$CLANG_DIR/bin/clang++
+export LDFLAGS="-lpthread -Wl,-rpath-link,$CLANG_DIR/lib -Wl,-rpath,\\\$\$ORIGIN/../lib,-rpath,\\\$\$ORIGIN/../../clang/lib"
+# Force re-libtoolization to overwrite files with the new libtool bits.
+perl -pi -e 's/(LIBTOOLIZE -c)/\1 -f/' autogen.sh
 ./autogen.sh
-./configure --prefix=$distdir --target=x86_64-apple-darwin11 --with-llvm-config=llvm-config
-export LDFLAGS=-lpthread
+./configure \
+    --prefix=$distdir \
+    --target=x86_64-apple-darwin \
+    --with-llvm-config=$CLANG_DIR/bin/llvm-config \
+    --enable-lto-support \
+    --enable-tapi-support \
+    --with-libtapi=$distdir
 
 make -j[% c("buildconf/num_procs") %] install
+strip $distdir/bin/*
+# cctools doesn't include dsymutil but clang will need to find it.
+cp $CLANG_DIR/bin/dsymutil $distdir/bin/x86_64-apple-darwin-dsymutil
+# various build scripts based on cmake want to find `lipo` without a prefix
+cp $distdir/bin/x86_64-apple-darwin-lipo $distdir/bin/lipo
 
 cd /var/tmp/dist
 [% c('tar', {
diff --git a/projects/cctools/config b/projects/cctools/config
index 8e7ff65..280e692 100644
--- a/projects/cctools/config
+++ b/projects/cctools/config
@@ -2,8 +2,8 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 version: '[% c("abbrev") %]'
 # This can be found in
-# browser/config/tooltool-manifest/macosx64/clang.manifest
-git_hash: 8e9c3f2506b51cf56725eaa60b6e90e240e249ca
+# taskcluster/ci/fetch/toolchains.yml
+git_hash: f2890afb8a52944dd8265e489a0691c7b0afdd54
 git_url: https://github.com/tpoechtrager/cctools-port
 
 var:
@@ -14,3 +14,5 @@ input_files:
   - project: container-image
   - name: clang
     project: clang
+  - name: libtapi
+    project: libtapi