diff options
author | Kerin Millar <kfm@plushkava.net> | 2021-09-14 04:48:51 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-09-19 02:38:16 +0100 |
commit | 4ee781d18fd2bbba3e78c70229f7aacd7d6c5a13 (patch) | |
tree | 490f7d129762d9ec3159167638e416d73bd98501 /dev-util | |
parent | media-video/pipewire: add missing include patch to 0.3.36 (diff) | |
download | gentoo-4ee781d18fd2bbba3e78c70229f7aacd7d6c5a13.tar.gz gentoo-4ee781d18fd2bbba3e78c70229f7aacd7d6c5a13.tar.bz2 gentoo-4ee781d18fd2bbba3e78c70229f7aacd7d6c5a13.zip |
dev-util/bazel: >=glibc-2.30 and gcc:11 compatibility fixes
Ensure that versions 0.22.0, 0.24.1 and 0.27.2 are also patched so as not to
conflict with glibc's gettid(2) function. Have all versions include the
<limits> header, where required, for compatibility with gcc:11. Revise the
dubious test for the presence of ccache so as to consider the value of
FEATURES instead. Drop version 2.0.0 in favour of 2.0.1.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=720032
Closes: https://bugs.gentoo.org/show_bug.cgi?id=787248
Closes: https://bugs.gentoo.org/show_bug.cgi?id=808827
Signed-off-by: Kerin Millar <kfm@plushkava.net>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/bazel/Manifest | 5 | ||||
-rw-r--r-- | dev-util/bazel/bazel-0.22.0.ebuild | 8 | ||||
-rw-r--r-- | dev-util/bazel/bazel-0.24.1.ebuild | 8 | ||||
-rw-r--r-- | dev-util/bazel/bazel-0.27.2.ebuild | 6 | ||||
-rw-r--r-- | dev-util/bazel/bazel-0.29.1.ebuild | 15 | ||||
-rw-r--r-- | dev-util/bazel/bazel-1.0.1.ebuild | 8 | ||||
-rw-r--r-- | dev-util/bazel/bazel-1.2.0-r1.ebuild | 114 | ||||
-rw-r--r-- | dev-util/bazel/bazel-1.2.1.ebuild | 13 | ||||
-rw-r--r-- | dev-util/bazel/bazel-2.0.0.ebuild | 109 | ||||
-rw-r--r-- | dev-util/bazel/bazel-2.0.1.ebuild (renamed from dev-util/bazel/bazel-1.2.0.ebuild) | 7 | ||||
-rw-r--r-- | dev-util/bazel/bazel-3.2.0.ebuild | 5 | ||||
-rw-r--r-- | dev-util/bazel/bazel-3.7.2.ebuild | 5 | ||||
-rw-r--r-- | dev-util/bazel/files/bazel-0.22.0-include-limits-for-gcc-11.patch | 125 | ||||
-rw-r--r-- | dev-util/bazel/files/bazel-0.22.0-rename-gettid-functions.patch | 44 | ||||
-rw-r--r-- | dev-util/bazel/files/bazel-0.24.1-rename-gettid-functions.patch | 66 | ||||
-rw-r--r-- | dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch | 25 |
16 files changed, 310 insertions, 253 deletions
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest index 5257e3ea42b4..b43555c562d3 100644 --- a/dev-util/bazel/Manifest +++ b/dev-util/bazel/Manifest @@ -2,11 +2,8 @@ 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 DIST bazel-1.2.1-dist.zip 267514406 BLAKE2B f9d316ac096f503a2c7fe101b103b88e7f0247f767a8dc28eb8c9d2cd0b6df6fa785f3b187e1a3963e2f9f0ae742a3330e5104e7a8aea75cb9b9e100366a5aca SHA512 bc0e6526bfbb8725a4f2ae95fc88b22229301b64559325fca3bcf5a9bc642cec2b2284eb9a6ce0699f1f910378b89ee23657dbea7928a92cc1900f1f2f405ff3 -DIST bazel-2.0.0-dist.zip 259625808 BLAKE2B 31b62fb3da1f6fc7efc4c3f44521e12f879a1e5b532fe814d8f49c01c511b34cd65df252d6d143fdcd96f72dc94d76249f79be50fc66a459132c030ef0182ca8 SHA512 db609e9d0ee0cdbfb999de850db17907af02dc26e605f4617dfeb2fbac5c30c4c0a9f48c6ba3673ffe8babb5b9e157cc51c32832015b85ed279b6b160506cdae +DIST bazel-2.0.1-dist.zip 259627931 BLAKE2B d535554aa989027e5ea16ccdaf3c966bd8d5c75282b0e13082efd0af9d6fba12b212a088dc2b83a57dfb873b479a8eae8864c36b2829ca81eaf6b7890c3f6aba SHA512 fec0d73af3a1d341cf1f6b14da98accdd3f1731ea23a41c921eed06040f2647b0e06a8ec58a51fb755fa932cdbba9e53216153f859be3944cf7b1d3a44629185 DIST bazel-3.2.0-dist.zip 269368916 BLAKE2B 1eb54c42e22432d2c836a87179094563b797744de423468bf9bce1b7b4dbcdce20e033ed03c4cd7ea5026c9e0d971e16202aff09f9c45d91c9fc53af6f0f8802 SHA512 fd8191188ecb49087b2b474bc383b2bb5d131460952be64b8930dc7e573fd14f99f231c4270b88fb4c9537fb94a04588fb580891519d20c7b90d705238f17f81 DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b diff --git a/dev-util/bazel/bazel-0.22.0.ebuild b/dev-util/bazel/bazel-0.22.0.ebuild index 1bd189ee41cc..c412ab10f061 100644 --- a/dev-util/bazel/bazel-0.22.0.ebuild +++ b/dev-util/bazel/bazel-0.22.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -43,8 +43,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -76,6 +77,9 @@ src_prepare() { test --verbose_failures --verbose_test_summary test --spawn_strategy=standalone --genrule_strategy=standalone EOF + + eapply "${FILESDIR}/${P}-rename-gettid-functions.patch" + eapply "${FILESDIR}/${P}-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-0.24.1.ebuild b/dev-util/bazel/bazel-0.24.1.ebuild index 1bd189ee41cc..b81e83d2dc79 100644 --- a/dev-util/bazel/bazel-0.24.1.ebuild +++ b/dev-util/bazel/bazel-0.24.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -43,8 +43,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -76,6 +77,9 @@ src_prepare() { test --verbose_failures --verbose_test_summary test --spawn_strategy=standalone --genrule_strategy=standalone EOF + + eapply "${FILESDIR}/${P}-rename-gettid-functions.patch" + eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-0.27.2.ebuild b/dev-util/bazel/bazel-0.27.2.ebuild index 89f679420550..819c66d7daa5 100644 --- a/dev-util/bazel/bazel-0.27.2.ebuild +++ b/dev-util/bazel/bazel-0.27.2.ebuild @@ -43,8 +43,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -63,6 +64,9 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" + eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-0.29.1.ebuild b/dev-util/bazel/bazel-0.29.1.ebuild index 2adb3ad66192..95740e9606ea 100644 --- a/dev-util/bazel/bazel-0.29.1.ebuild +++ b/dev-util/bazel/bazel-0.29.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,9 +8,7 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing DESCRIPTION="Fast and correct automated build system" HOMEPAGE="https://bazel.build/" -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}" +SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" LICENSE="Apache-2.0" SLOT="0" @@ -45,17 +43,15 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_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() { @@ -68,6 +64,9 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" + eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-1.0.1.ebuild b/dev-util/bazel/bazel-1.0.1.ebuild index 84224be11667..25dd653392af 100644 --- a/dev-util/bazel/bazel-1.0.1.ebuild +++ b/dev-util/bazel/bazel-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,8 +43,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -63,6 +64,9 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" + eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-1.2.0-r1.ebuild b/dev-util/bazel/bazel-1.2.0-r1.ebuild deleted file mode 100644 index d9875eb6ce03..000000000000 --- a/dev-util/bazel/bazel-1.2.0-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 java-pkg-2 multiprocessing - -DESCRIPTION="Fast and correct automated build system" -HOMEPAGE="https://bazel.build/" - -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" -KEYWORDS="~amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jdk-1.8:*" -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -bazel-get-flags() { - local i fs=() - for i in ${CFLAGS}; do - fs+=( "--copt=${i}" "--host_copt=${i}" ) - done - for i in ${CXXFLAGS}; do - fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) - done - for i in ${CPPFLAGS}; do - fs+=( "--copt=${i}" "--host_copt=${i}" ) - fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) - done - for i in ${LDFLAGS}; do - fs+=( "--linkopt=${i}" "--host_linkopt=${i}" ) - done - echo "${fs[*]}" -} - -pkg_setup() { - echo ${PATH} | grep -q ccache && \ - ewarn "${PN} usually fails to compile with ccache, you have been warned" - java-pkg-2_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() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk" - VERBOSE=yes ./compile.sh || die - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-1.2.1.ebuild b/dev-util/bazel/bazel-1.2.1.ebuild index edeaeed960bf..819c66d7daa5 100644 --- a/dev-util/bazel/bazel-1.2.1.ebuild +++ b/dev-util/bazel/bazel-1.2.1.ebuild @@ -8,9 +8,7 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing DESCRIPTION="Fast and correct automated build system" HOMEPAGE="https://bazel.build/" -GLIBC_GETTID_PATCH="${PN}-1.2.0-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}" +SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" LICENSE="Apache-2.0" SLOT="0" @@ -45,17 +43,15 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_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() { @@ -68,6 +64,9 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" + eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-2.0.0.ebuild b/dev-util/bazel/bazel-2.0.0.ebuild deleted file mode 100644 index 8963929994ec..000000000000 --- a/dev-util/bazel/bazel-2.0.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="examples tools" -# strip corrupts the bazel binary -# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) -RESTRICT="strip test" -RDEPEND=">=virtual/jdk-1.8:*" -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" - -bazel-get-flags() { - local i fs=() - for i in ${CFLAGS}; do - fs+=( "--copt=${i}" "--host_copt=${i}" ) - done - for i in ${CXXFLAGS}; do - fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) - done - for i in ${CPPFLAGS}; do - fs+=( "--copt=${i}" "--host_copt=${i}" ) - fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) - done - for i in ${LDFLAGS}; do - fs+=( "--linkopt=${i}" "--host_linkopt=${i}" ) - done - echo "${fs[*]}" -} - -pkg_setup() { - echo ${PATH} | grep -q ccache && \ - ewarn "${PN} usually fails to compile with ccache, you have been warned" - java-pkg-2_pkg_setup -} - -src_unpack() { - # Only unpack the main distfile - unpack ${P}-dist.zip -} - -src_prepare() { - default - - # F: fopen_wr - # S: deny - # P: /proc/self/setgroups - # A: /proc/self/setgroups - # R: /proc/24939/setgroups - # C: /usr/lib/systemd/systemd - addpredict /proc -} - -src_compile() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk" - VERBOSE=yes ./compile.sh || die - - ./scripts/generate_bash_completion.sh \ - --bazel=output/bazel \ - --output=bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash -} - -src_test() { - output/bazel test \ - --verbose_failures \ - --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --verbose_test_summary \ - examples/cpp:hello-success_test || die - output/bazel shutdown -} - -src_install() { - dobin output/bazel - newbashcomp bazel-complete.bash ${PN} - bashcomp_alias ${PN} ibazel - insinto /usr/share/zsh/site-functions - doins scripts/zsh_completion/_bazel - - if use examples; then - docinto examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi - # could really build tools but I don't know which ones - # are actually used - if use tools; then - docinto tools - dodoc -r tools/* - docompress -x /usr/share/doc/${PF}/tools - docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata - fi -} diff --git a/dev-util/bazel/bazel-1.2.0.ebuild b/dev-util/bazel/bazel-2.0.1.ebuild index 84224be11667..426d7485ab0d 100644 --- a/dev-util/bazel/bazel-1.2.0.ebuild +++ b/dev-util/bazel/bazel-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,8 +43,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -63,6 +64,8 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-3.2.0.ebuild b/dev-util/bazel/bazel-3.2.0.ebuild index ac040b43670e..ba0583025946 100644 --- a/dev-util/bazel/bazel-3.2.0.ebuild +++ b/dev-util/bazel/bazel-3.2.0.ebuild @@ -44,8 +44,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -64,6 +65,8 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${P}-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/bazel-3.7.2.ebuild b/dev-util/bazel/bazel-3.7.2.ebuild index ac040b43670e..8f687a47d16b 100644 --- a/dev-util/bazel/bazel-3.7.2.ebuild +++ b/dev-util/bazel/bazel-3.7.2.ebuild @@ -44,8 +44,9 @@ bazel-get-flags() { } pkg_setup() { - echo ${PATH} | grep -q ccache && \ + if has ccache ${FEATURES}; then ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi java-pkg-2_pkg_setup } @@ -64,6 +65,8 @@ src_prepare() { # R: /proc/24939/setgroups # C: /usr/lib/systemd/systemd addpredict /proc + + eapply "${FILESDIR}/${PN}-3.2.0-include-limits-for-gcc-11.patch" } src_compile() { diff --git a/dev-util/bazel/files/bazel-0.22.0-include-limits-for-gcc-11.patch b/dev-util/bazel/files/bazel-0.22.0-include-limits-for-gcc-11.patch new file mode 100644 index 000000000000..e05c2263de06 --- /dev/null +++ b/dev-util/bazel/files/bazel-0.22.0-include-limits-for-gcc-11.patch @@ -0,0 +1,125 @@ +diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc +index fbfca42723..a105ee89a7 100644 +--- a/third_party/ijar/mapped_file_unix.cc ++++ b/third_party/ijar/mapped_file_unix.cc +@@ -19,6 +19,7 @@ + #include <sys/mman.h> + + #include <algorithm> ++#include <limits> + + #include "third_party/ijar/mapped_file.h" + +diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h +index ed6616362f..da0848852b 100644 +--- a/third_party/ijar/zlib_client.h ++++ b/third_party/ijar/zlib_client.h +@@ -19,6 +19,8 @@ + + #include "third_party/ijar/common.h" + ++#include <limits> ++ + namespace devtools_ijar { + // Try to compress a file entry in memory using the deflate algorithm. + // It will compress buf (of size length) unless the compressed size is bigger +diff --git a/third_party/protobuf/3.6.1/python/google/protobuf/pyext/message.cc b/third_party/protobuf/3.6.1/python/google/protobuf/pyext/message.cc +index 5893533adf..78d964266d 100644 +--- a/third_party/protobuf/3.6.1/python/google/protobuf/pyext/message.cc ++++ b/third_party/protobuf/3.6.1/python/google/protobuf/pyext/message.cc +@@ -33,6 +33,7 @@ + + #include <google/protobuf/pyext/message.h> + ++#include <limits> + #include <map> + #include <memory> + #include <string> +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/repeated_field.cc b/third_party/protobuf/3.6.1/src/google/protobuf/repeated_field.cc +index 310000aabb..f95803d4f2 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/repeated_field.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/repeated_field.cc +@@ -33,6 +33,7 @@ + // Sanjay Ghemawat, Jeff Dean, and others. + + #include <algorithm> ++#include <limits> + + #include <google/protobuf/repeated_field.h> + #include <google/protobuf/stubs/logging.h> +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/stubs/bytestream.cc b/third_party/protobuf/3.6.1/src/google/protobuf/stubs/bytestream.cc +index f4af6a50ab..c3af6b7310 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/stubs/bytestream.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/stubs/bytestream.cc +@@ -32,6 +32,7 @@ + + #include <string.h> + #include <algorithm> ++#include <limits> + + namespace google { + namespace protobuf { +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/util/field_comparator_test.cc b/third_party/protobuf/3.6.1/src/google/protobuf/util/field_comparator_test.cc +index 249b8d5463..d5363c7784 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/util/field_comparator_test.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/util/field_comparator_test.cc +@@ -42,6 +42,8 @@ + // and the opensource version gtest.h header includes cmath transitively + // somehow. + #include <gtest/gtest.h> ++#include <limits> ++ + namespace google { + namespace protobuf { + namespace util { +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/datapiece.cc b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/datapiece.cc +index 59bc28ae71..914fe18913 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/datapiece.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/datapiece.cc +@@ -38,6 +38,8 @@ + #include <google/protobuf/stubs/mathlimits.h> + #include <google/protobuf/stubs/mathutil.h> + ++#include <limits> ++ + namespace google { + namespace protobuf { + namespace util { +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/json_objectwriter_test.cc b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/json_objectwriter_test.cc +index 0dc710c7fe..aedf26bb12 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/json_objectwriter_test.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/json_objectwriter_test.cc +@@ -34,6 +34,8 @@ + #include <google/protobuf/util/internal/utility.h> + #include <gtest/gtest.h> + ++#include <limits> ++ + namespace google { + namespace protobuf { + namespace util { +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/protostream_objectwriter_test.cc b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/protostream_objectwriter_test.cc +index 7f0df5677e..7d19608928 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/protostream_objectwriter_test.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/protostream_objectwriter_test.cc +@@ -58,6 +58,8 @@ + #include <gtest/gtest.h> + + ++#include <limits> ++ + namespace google { + namespace protobuf { + namespace util { +diff --git a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/utility.cc b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/utility.cc +index b8d917ce28..5b1694503b 100644 +--- a/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/utility.cc ++++ b/third_party/protobuf/3.6.1/src/google/protobuf/util/internal/utility.cc +@@ -31,6 +31,7 @@ + #include <google/protobuf/util/internal/utility.h> + + #include <algorithm> ++#include <limits> + + #include <google/protobuf/stubs/callback.h> + #include <google/protobuf/stubs/common.h> diff --git a/dev-util/bazel/files/bazel-0.22.0-rename-gettid-functions.patch b/dev-util/bazel/files/bazel-0.22.0-rename-gettid-functions.patch new file mode 100644 index 000000000000..0450300c2c90 --- /dev/null +++ b/dev-util/bazel/files/bazel-0.22.0-rename-gettid-functions.patch @@ -0,0 +1,44 @@ +diff --git a/third_party/grpc/src/core/support/log_linux.c b/third_party/grpc/src/core/support/log_linux.c +index 93a0c1b4c6..367c92118e 100644 +--- a/third_party/grpc/src/core/support/log_linux.c ++++ b/third_party/grpc/src/core/support/log_linux.c +@@ -54,7 +54,7 @@ + #include <sys/syscall.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char *file, int line, gpr_log_severity severity, + const char *format, ...) { +@@ -95,7 +95,7 @@ void gpr_default_log(gpr_log_func_args *args) { + + gpr_asprintf(&prefix, "%s%s.%09d %7tu %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-60s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/support/log_posix.c b/third_party/grpc/src/core/support/log_posix.c +index 3ff171f99c..f0420a7b3b 100644 +--- a/third_party/grpc/src/core/support/log_posix.c ++++ b/third_party/grpc/src/core/support/log_posix.c +@@ -45,7 +45,7 @@ + #include <time.h> + #include <pthread.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char *file, int line, gpr_log_severity severity, + const char *format, ...) { +@@ -95,7 +95,7 @@ void gpr_default_log(gpr_log_func_args *args) { + + fprintf(stderr, "%s%s.%09d %7tu %s:%d] %s\n", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line, ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line, + args->message); + } + diff --git a/dev-util/bazel/files/bazel-0.24.1-rename-gettid-functions.patch b/dev-util/bazel/files/bazel-0.24.1-rename-gettid-functions.patch new file mode 100644 index 000000000000..39cf94d94695 --- /dev/null +++ b/dev-util/bazel/files/bazel-0.24.1-rename-gettid-functions.patch @@ -0,0 +1,66 @@ +diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/third_party/grpc/src/core/lib/gpr/log_linux.cc +index 561276f0c2..8b597b4cf2 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/third_party/grpc/src/core/lib/gpr/log_posix.cc +index 0acb225572..cd0b702b94 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc +@@ -30,7 +30,7 @@ + #include <string.h> + #include <time.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -85,7 +85,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7tu %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +index 7a4870db78..4258ded8a0 100644 +--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1150,7 +1150,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1170,7 +1170,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (grpc_polling_trace.enabled()) { + gpr_log(GPR_INFO, diff --git a/dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch b/dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch new file mode 100644 index 000000000000..c864eb4017e6 --- /dev/null +++ b/dev-util/bazel/files/bazel-3.2.0-include-limits-for-gcc-11.patch @@ -0,0 +1,25 @@ +diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc +index 6e3a908718..030e9ca59f 100644 +--- a/third_party/ijar/mapped_file_unix.cc ++++ b/third_party/ijar/mapped_file_unix.cc +@@ -19,6 +19,7 @@ + #include <sys/mman.h> + + #include <algorithm> ++#include <limits> + + #include "third_party/ijar/mapped_file.h" + +diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h +index ed6616362f..da0848852b 100644 +--- a/third_party/ijar/zlib_client.h ++++ b/third_party/ijar/zlib_client.h +@@ -19,6 +19,8 @@ + + #include "third_party/ijar/common.h" + ++#include <limits> ++ + namespace devtools_ijar { + // Try to compress a file entry in memory using the deflate algorithm. + // It will compress buf (of size length) unless the compressed size is bigger |