Bug 1338016 - Use clang from tooltool to build hfsplus. r?mshal
--- a/build/unix/build-hfsplus/build-hfsplus.sh
+++ b/build/unix/build-hfsplus/build-hfsplus.sh
@@ -12,25 +12,22 @@ if [ -z "$root_dir" -o ! -d "$root_dir"
root_dir=$(mktemp -d)
fi
cd $root_dir
if test -z $TMPDIR; then
TMPDIR=/tmp/
fi
-# Install clang first
-yum install -y clang
-
# Set an md5 check file to validate input
echo "${md5sum} *${TMPDIR}/${filename}" > $TMPDIR/hfsplus.MD5
# Most-upstream is https://opensource.apple.com/source/diskdev_cmds/
-# Download the source of the specified version of binutils
+# Download the source of the specified version of hfsplus
wget -c -P $TMPDIR http://pkgs.fedoraproject.org/repo/pkgs/hfsplus-tools/${filename}/${md5sum}/${filename} || exit 1
md5sum -c $TMPDIR/hfsplus.MD5 || exit 1
mkdir hfsplus-source
tar xzf $TMPDIR/${filename} -C hfsplus-source --strip-components=1
# Build
cd hfsplus-source
make $make_flags || exit 1
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -108,25 +108,26 @@ linux64-cctools-port/opt:
docker-image: {in-tree: desktop-build}
max-run-time: 36000
when:
files-changed:
- 'taskcluster/scripts/misc/build-cctools-port.sh'
- 'taskcluster/taskgraph/transforms/job/toolchain.py'
linux64-hfsplus/opt:
- description: "hfplus toolchain build"
+ description: "hfsplus toolchain build"
treeherder:
kind: build
platform: linux64/opt
symbol: Cc(hfsplus)
tier: 1
run:
using: toolchain-script
script: build-hfsplus-linux.sh
+ tooltool-downloads: public
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
implementation: docker-worker
docker-image: {in-tree: desktop-build}
max-run-time: 36000
when:
files-changed:
- 'build/unix/build-hfsplus/**'
--- a/taskcluster/scripts/misc/build-hfsplus-linux.sh
+++ b/taskcluster/scripts/misc/build-hfsplus-linux.sh
@@ -4,13 +4,18 @@ set -x -e -v
# This script is for building hfsplus for Linux.
WORKSPACE=$HOME/workspace
HOME_DIR=$WORKSPACE/build
UPLOAD_DIR=$WORKSPACE/artifacts
cd $HOME_DIR/src
+TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/clang.manifest
+. taskcluster/scripts/misc/tooltool-download.sh
+
+export PATH=$PATH:$HOME_DIR/src/clang/bin
+
build/unix/build-hfsplus/build-hfsplus.sh $HOME_DIR
# Put a tarball in the artifacts dir
mkdir -p $UPLOAD_DIR
cp $HOME_DIR/hfsplus-tools.tar.* $UPLOAD_DIR