From 698fb8eb416f848dff3553d21bae2b445f003370 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Thu, 26 Mar 2020 09:36:13 +0800 Subject: [PATCH] dev-util/bazel: backport gettid patch to 0.29.1. bazel-0.29.1 is still relevant because sci-libs/tensorflow-2.1.0 depends on it. Reported-By: foufou33@gmail.com, Zheng Dong Closes: https://bugs.gentoo.org/712718 Package-Manager: Portage-2.3.88, Repoman-2.3.18 Signed-off-by: Benda Xu --- dev-util/bazel/Manifest | 1 + dev-util/bazel/bazel-0.29.1.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest index a40141251384..9d8bd75b8afd 100644 --- a/dev-util/bazel/Manifest +++ b/dev-util/bazel/Manifest @@ -2,6 +2,7 @@ DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3 DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774 DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab DIST bazel-0.29.1-dist.zip 265744999 BLAKE2B 8495ab96947b02ec827cc2b5f542454e0d631eb077514c740d8be813495644f0be1020e706e2dbd321fa6f39af3060c4a7b2e68499201eaffc197704c1ecf760 SHA512 4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d +DIST bazel-0.29.1-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1b428ad421bbf37cafdc38dc46cbe9d9fe516e957f1dc3a30333c40a6ec3e61580ca908189a8821937ddd28aa9cf119ae237d63c576fb SHA512 0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04 DIST bazel-1.0.1-dist.zip 267211562 BLAKE2B ade5fcc2a799df4da24ce23a3f2f23d3f38aeec832ef2504a1a8ca7f23acafe3d5b5d94302f101ddadb366d7144624559c96c1c343fa465a976ca2c9b258c083 SHA512 94d81697d2f181659c2d386de23dae2655c4131633f8ce6d10c60373222756e8c0330ed3fe5ed20f81a8648bcb3acfc8b4762e96eb7950b58a4a5c94c715159f DIST bazel-1.2.0-dist.zip 267514282 BLAKE2B 1c4f9dcf2c18e6880d701dab3de2e880e55278216ba051f9ad753b9f8c539e5734346bcb20c706307b677f97736587ee11e3c3accabe4c82ac1a82a0cdafcd36 SHA512 eaa3e27d0ddd6102fea4fcdf5f4379355954ba25cd2f4b3530071d077411f8a501041d8fda9ac90325244296f31072faaebd91cf6338893752b25212822a6be9 DIST bazel-1.2.0-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1b428ad421bbf37cafdc38dc46cbe9d9fe516e957f1dc3a30333c40a6ec3e61580ca908189a8821937ddd28aa9cf119ae237d63c576fb SHA512 0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04 diff --git a/dev-util/bazel/bazel-0.29.1.ebuild b/dev-util/bazel/bazel-0.29.1.ebuild index 89f679420550..2adb3ad66192 100644 --- a/dev-util/bazel/bazel-0.29.1.ebuild +++ b/dev-util/bazel/bazel-0.29.1.ebuild @@ -8,7 +8,9 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing DESCRIPTION="Fast and correct automated build system" HOMEPAGE="https://bazel.build/" -SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" +GLIBC_GETTID_PATCH="${P}-rename-gettid-functions.patch" +SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip + https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> ${GLIBC_GETTID_PATCH}" LICENSE="Apache-2.0" SLOT="0" @@ -51,6 +53,9 @@ pkg_setup() { src_unpack() { # Only unpack the main distfile unpack ${P}-dist.zip + pushd third_party/grpc/src >/dev/null || die + eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}" + popd >/dev/null || die } src_prepare() { -- 2.26.2