Bug 1692418 - Upgrade cctools-port. r=firefox-build-system-reviewers,dmajor

The newer version optionally uses the ldid tool to fake-sign binaries on
arm64, which we pull and package together.

Differential Revision: https://phabricator.services.mozilla.com/D104973
This commit is contained in:
Mike Hommey 2021-02-12 21:44:26 +00:00
Родитель 832c277718
Коммит d5812ccae9
3 изменённых файлов: 15 добавлений и 1 удалений

Просмотреть файл

@ -300,7 +300,7 @@ cctools-port:
fetch:
type: git
repo: https://github.com/tpoechtrager/cctools-port
revision: 43f32a4c61b5ba7fde011e816136c550b1b3146f
revision: 30518813875aed656aa7f18b6d485feee25f8f87
libtapi:
description: libtapi source code
@ -309,6 +309,13 @@ libtapi:
repo: https://github.com/tpoechtrager/apple-libtapi
revision: b4f141a16c7c82f75973429c92242a8c7de3ddb1
ldid:
description: ldid source code
fetch:
type: git
repo: https://github.com/tpoechtrager/ldid
revision: 4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
libdmg-hfsplus:
description: libdmg-hfsplug source code
fetch:

Просмотреть файл

@ -11,6 +11,7 @@ job-defaults:
fetch:
- cctools-port
- libtapi
- ldid
linux64-cctools-port-clang-11:
treeherder:

Просмотреть файл

@ -16,6 +16,7 @@ CROSSTOOLS_CCTOOLS_DIR=$CROSSTOOLS_SOURCE_DIR/cctools
CROSSTOOLS_BUILD_DIR=$WORKSPACE/cctools
LIBTAPI_SOURCE_DIR=$MOZ_FETCHES_DIR/apple-libtapi
LIBTAPI_BUILD_DIR=$WORKSPACE/libtapi-build
LDID_SOURCE_DIR=$MOZ_FETCHES_DIR/ldid
CLANG_DIR=$MOZ_FETCHES_DIR/clang
# Create our directories
@ -76,6 +77,11 @@ perl -pi -e 's/(LIBTOOLIZE -c)/\1 -f/' autogen.sh
# Build cctools
make -j `nproc --all` install
# Build ldid
cd $LDID_SOURCE_DIR
make -j `nproc --all` install INSTALLPREFIX=$CROSSTOOLS_BUILD_DIR LDFLAGS="-Wl,-Bstatic -lcrypto -Wl,-Bdynamic -ldl -pthread"
strip $CROSSTOOLS_BUILD_DIR/bin/*
# cctools-port doesn't include dsymutil but clang will need to find it.
cp $CLANG_DIR/bin/dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin-dsymutil