From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-util/bazel/Manifest | 24 +--- dev-util/bazel/bazel-0.22.0.ebuild | 125 --------------------- dev-util/bazel/bazel-0.24.1.ebuild | 125 --------------------- dev-util/bazel/bazel-0.27.2.ebuild | 113 ------------------- dev-util/bazel/bazel-0.29.1.ebuild | 113 ------------------- dev-util/bazel/bazel-1.0.1.ebuild | 113 ------------------- dev-util/bazel/bazel-1.2.1.ebuild | 113 ------------------- dev-util/bazel/bazel-2.0.1.ebuild | 112 ------------------ dev-util/bazel/bazel-3.2.0.ebuild | 116 ------------------- dev-util/bazel/bazel-3.7.2-r1.ebuild | 3 +- .../bazel-0.22.0-include-limits-for-gcc-11.patch | 125 --------------------- .../bazel-0.22.0-rename-gettid-functions.patch | 44 -------- .../bazel-0.24.1-rename-gettid-functions.patch | 66 ----------- .../bazel-3.7.2-musl-temp-failure-retry.patch | 34 ++++++ dev-util/bazel/metadata.xml | 4 - 15 files changed, 39 insertions(+), 1191 deletions(-) delete mode 100644 dev-util/bazel/bazel-0.22.0.ebuild delete mode 100644 dev-util/bazel/bazel-0.24.1.ebuild delete mode 100644 dev-util/bazel/bazel-0.27.2.ebuild delete mode 100644 dev-util/bazel/bazel-0.29.1.ebuild delete mode 100644 dev-util/bazel/bazel-1.0.1.ebuild delete mode 100644 dev-util/bazel/bazel-1.2.1.ebuild delete mode 100644 dev-util/bazel/bazel-2.0.1.ebuild delete mode 100644 dev-util/bazel/bazel-3.2.0.ebuild delete mode 100644 dev-util/bazel/files/bazel-0.22.0-include-limits-for-gcc-11.patch delete mode 100644 dev-util/bazel/files/bazel-0.22.0-rename-gettid-functions.patch delete mode 100644 dev-util/bazel/files/bazel-0.24.1-rename-gettid-functions.patch create mode 100644 dev-util/bazel/files/bazel-3.7.2-musl-temp-failure-retry.patch (limited to 'dev-util/bazel') diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest index 3d48a83d5bbd..d5cf24017882 100644 --- a/dev-util/bazel/Manifest +++ b/dev-util/bazel/Manifest @@ -1,23 +1,5 @@ -AUX bazel-0.22.0-include-limits-for-gcc-11.patch 5082 BLAKE2B 8e014f2cd08df441bae41f22a85e39de1a3298743c2330c279942b7fb03c217130e7e3f783395f902d7e5cc85940e63f8b503adb9e8c7dd406e8d79501c44b51 SHA512 671ec8e685d2b3aef738970a0807024a9454e998983ccec85a5bda7b0fcaa1bf5d285158201a4057d5b2cbba7a18dc89dac6f84b472606156217c8b868207582 -AUX bazel-0.22.0-rename-gettid-functions.patch 1876 BLAKE2B 1b0d2a79068d119c55a995fc6b053d04e51d576a6078a8efb3b45fadbc85d9422a218ed23201c576db3d8ec7e481cf153f7d8de94ee9d5e19aef72217d78e0d8 SHA512 6cd0450e45f7a1f40186b274c95e7be731abf119d36b5e079259a2cfe8f2a26484246b350c8ebffc43ca0f095e8ff348934b12593dfbe928d819352a33fa1de0 -AUX bazel-0.24.1-rename-gettid-functions.patch 2752 BLAKE2B a5b04072f6cb980a5f5fe873361594baf2c3abf6c5f193e466dce123864b2d12e660390fba3ed7937f80b32d40960885f6ffa9ebdeaec8729cc425cb291ea2fc SHA512 1cca576c217457e9fa0074d7dbb91196c31f1afe4c658c6108074d8237e67eb53f801a281a0cdfdf195374351cbb77c203b89818789cb626a7e8acf7a46c0fab AUX bazel-3.2.0-include-limits-for-gcc-11.patch 788 BLAKE2B 7eadc6f43c1a527584f2b4d8d59387ffa1526fb7282919d38dd8a05eaa35766addd900c105444ea6925db868ee8ef8ff8297095926cb78597d23131f350539ae SHA512 d8997f67f79aaf276f0b9b2e60928f39b34722323947c597b6bcc3a7a7211be9e7a1e65917d7e7f92bc88f9ef79a7803c352ebe823ee5f933918f6f00716218a -DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3c1fd3af7147e13b1474353fdf4cba1f58deed6d1880ec85fe5a07940b8df14af2701361d86e638b5c0e6924300c1 SHA512 b93cd21f0f164c118b90efba761a9492eb9894e24f13ff468defd12b86c7e67f16e51060ac2fc4c2f8dbf51b1c833d41b255fdd8107988e5babf093cfc5b3254 -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-1.0.1-dist.zip 267211562 BLAKE2B ade5fcc2a799df4da24ce23a3f2f23d3f38aeec832ef2504a1a8ca7f23acafe3d5b5d94302f101ddadb366d7144624559c96c1c343fa465a976ca2c9b258c083 SHA512 94d81697d2f181659c2d386de23dae2655c4131633f8ce6d10c60373222756e8c0330ed3fe5ed20f81a8648bcb3acfc8b4762e96eb7950b58a4a5c94c715159f -DIST bazel-1.2.1-dist.zip 267514406 BLAKE2B f9d316ac096f503a2c7fe101b103b88e7f0247f767a8dc28eb8c9d2cd0b6df6fa785f3b187e1a3963e2f9f0ae742a3330e5104e7a8aea75cb9b9e100366a5aca SHA512 bc0e6526bfbb8725a4f2ae95fc88b22229301b64559325fca3bcf5a9bc642cec2b2284eb9a6ce0699f1f910378b89ee23657dbea7928a92cc1900f1f2f405ff3 -DIST bazel-2.0.1-dist.zip 259627931 BLAKE2B d535554aa989027e5ea16ccdaf3c966bd8d5c75282b0e13082efd0af9d6fba12b212a088dc2b83a57dfb873b479a8eae8864c36b2829ca81eaf6b7890c3f6aba SHA512 fec0d73af3a1d341cf1f6b14da98accdd3f1731ea23a41c921eed06040f2647b0e06a8ec58a51fb755fa932cdbba9e53216153f859be3944cf7b1d3a44629185 -DIST bazel-3.2.0-dist.zip 269368916 BLAKE2B 1eb54c42e22432d2c836a87179094563b797744de423468bf9bce1b7b4dbcdce20e033ed03c4cd7ea5026c9e0d971e16202aff09f9c45d91c9fc53af6f0f8802 SHA512 fd8191188ecb49087b2b474bc383b2bb5d131460952be64b8930dc7e573fd14f99f231c4270b88fb4c9537fb94a04588fb580891519d20c7b90d705238f17f81 +AUX bazel-3.7.2-musl-temp-failure-retry.patch 1238 BLAKE2B d6890d77ddd256fd1fa681ecf0aad1c5ac4e4e2f4ff46276b54a3464a6394136fe239aa32a5ce11b97fc78b90fb6615746b418eb320d33a3640b4932c929431a SHA512 81e5cd55dcf3d158af88e2edf286862b75c1585abe6d37ff67a99716b6c57a338d22c2a96f8938a10a374348edc532e01670e164fb376b3df70471afa11c898b DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b -EBUILD bazel-0.22.0.ebuild 2999 BLAKE2B 179d1f9a8c31fd3bd02e736aa8fcec17baa6eaddaa280650c5ac5eb31dbffb5ee29aef79b276f70bc6e06f5a39c19f94f5b34bfcc3f0904394560a9cbe3af47f SHA512 1d6b3bff3a24339b94abf02bfc3df3cc9cc539f5d35d1b4f66a13ac2775fb23f6cd43745fe9b80d6672ae5e17ffa1787c7d7e4931fd21dc86c9b4ffbe1c5bce0 -EBUILD bazel-0.24.1.ebuild 3007 BLAKE2B 036276a705a625ff002f5ddc0ca8434d29fe4e56b4564611e29d3625ff3e9009b4b329ddf7ef4cab68ba2d4848b2c14101c2be5f88ad71e19d811759e5d5df73 SHA512 be07a3fea81d022d8cff62a2bfb32bc83be34301209ebec54a815ecd701ecd3c1829211725290435730d588be66f3bc1ee765a0e4e00718d963845cf451d71ed -EBUILD bazel-0.27.2.ebuild 2742 BLAKE2B 16874c3b0ee6b24af9a117d9d3cb31f61e76cf4e43804542e759982eb8f3b5ffd48349103df0a2b5c545967e8c5b519fe3c6ab7cfaf7676e64697840b5f48a34 SHA512 38acb30144a86330428f0cd125414a940fabfe468b7d28150e5aa6027f1870ea55adfdd84518f716524d232e6c6c862c7d04a03c40cb26c5b5b529f418c022ad -EBUILD bazel-0.29.1.ebuild 2742 BLAKE2B 16874c3b0ee6b24af9a117d9d3cb31f61e76cf4e43804542e759982eb8f3b5ffd48349103df0a2b5c545967e8c5b519fe3c6ab7cfaf7676e64697840b5f48a34 SHA512 38acb30144a86330428f0cd125414a940fabfe468b7d28150e5aa6027f1870ea55adfdd84518f716524d232e6c6c862c7d04a03c40cb26c5b5b529f418c022ad -EBUILD bazel-1.0.1.ebuild 2743 BLAKE2B 3ae56ff90ef4002eb48e88f788b8a63e02bc7f0a81a9bc12764bca96ed33b96d77a56a5ca8964f62a72535f2d32fec35f03b042780adcae94f2f6dc450c86152 SHA512 459ea7870ce28dfe88efde0c9123732d9a94039b2145a8f0c5b5e20d73e122c85ad392c97a6974fb9a91a77126195d73c16efdd8784a3836e946c54f659fc58b -EBUILD bazel-1.2.1.ebuild 2742 BLAKE2B 16874c3b0ee6b24af9a117d9d3cb31f61e76cf4e43804542e759982eb8f3b5ffd48349103df0a2b5c545967e8c5b519fe3c6ab7cfaf7676e64697840b5f48a34 SHA512 38acb30144a86330428f0cd125414a940fabfe468b7d28150e5aa6027f1870ea55adfdd84518f716524d232e6c6c862c7d04a03c40cb26c5b5b529f418c022ad -EBUILD bazel-2.0.1.ebuild 2678 BLAKE2B edc83ee6b2b061a7ac28af348ba88bf1ac91acbc46302f483f4f783351afba4ea820f5fceffe04b131948e11d582f3d33c68fd05a1b7c04469cccce1770b8f84 SHA512 71c082a3382ab2f3954690a11ac0f41162f5ea3a2294841029b4602d20572bdeb0353ca7bd6f7a48cb678f8f00f8bd5eb0316b90293be7dc9d4ee2de2b602721 -EBUILD bazel-3.2.0.ebuild 2845 BLAKE2B a6988e3db928d1856f852169f0419a9201467a6dafe8f90154ed42afc421858df271f0704ea59b0084dfaea632eda45854f77f5245c8885594071012a0c8c312 SHA512 de6859234ea01e045f90454c71fff97bfc4ec299e3a7119739d0bdcf439d0f29b5679dd5df1f4102a5ed3249caa5f80cc5d19a5e899735d6a37fecd0f6595c44 -EBUILD bazel-3.7.2-r1.ebuild 2677 BLAKE2B d45baf321f0c4588cf6906034fa103d624b82bdf02d9d1e7f8cd293ea063aafc1e7848b7382da87137b91335cdb193abae32ac69c59a27fcbecc041adc40d5b1 SHA512 a26504d8150b1b6d9af5bcdf021e50c1e0555095f15df9a4b5706dfb47bd3ac7451cd5a023ac68edcdfb85890f96fcd10152cf0cb9039d95398662e11a32d74e -MISC metadata.xml 845 BLAKE2B df4fadd622f9bf9221313050afe7fde503179d4b91c4b3b1485eefe1d5ca411f1d93d5ec875cec070587c5522e51bfd5ba6d62430014218bc0189fa440f6a2d9 SHA512 96fe79b25e3e2f32fa551793e208c7c5344fab9cda8b59a51eeb19bb01cdcb30bf24ec575bf4e732775d40fcfc4aa356a75b3592114cbaf4d88f38887184aa6a +EBUILD bazel-3.7.2-r1.ebuild 2740 BLAKE2B c6aaea27500b46a0aa684410307726b6ba5a306b27331cdee0e4b6af09cd711fb6918eeb0e9ac1c84e4fce1f22b870f7bf0f62b498e16ea71a232ea5280ca5af SHA512 f3b810aa3af9baf87e732029235650bb59c1f9894bc80b7973fbeed47e8c362b5c6dc75365b752043e655c8a57f52bcdb8a8aaa0f7491b7a34619d778571b4ab +MISC metadata.xml 706 BLAKE2B 07f70164b2e809db66f4255b62635e1b93ff58269f323a0efbfd994dd425034e4896599463c900582f0863cebf8f5ee0dd56da01bafbd30c9e27e88ffb99ad46 SHA512 3a335159533ca5f0d7de3b1bde18a737ba2dca2de56121124cdb9cb05009db5fac07bef1d21d5b73bec834b7928e7ec291e2ff3cd964e395431b9deac29bfbe6 diff --git a/dev-util/bazel/bazel-0.22.0.ebuild b/dev-util/bazel/bazel-0.22.0.ebuild deleted file mode 100644 index c412ab10f061..000000000000 --- a/dev-util/bazel/bazel-0.22.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 -RESTRICT="strip" -RDEPEND="virtual/jdk:1.8" -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" -QA_FLAGS_IGNORED="usr/bin/bazel" - -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() { - 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 -} - -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 - - # Use standalone strategy to deactivate the bazel sandbox, since it - # conflicts with FEATURES=sandbox. - cat > "${T}/bazelrc" <<-EOF || die - build --verbose_failures - build --spawn_strategy=standalone --genrule_strategy=standalone - - build --distdir="${S}/derived/distdir/" - build --jobs=$(makeopts_jobs) $(bazel-get-flags) - - 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() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) --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 - fi -} diff --git a/dev-util/bazel/bazel-0.24.1.ebuild b/dev-util/bazel/bazel-0.24.1.ebuild deleted file mode 100644 index b81e83d2dc79..000000000000 --- a/dev-util/bazel/bazel-0.24.1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 -RESTRICT="strip" -RDEPEND="virtual/jdk:1.8" -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip" - -S="${WORKDIR}" -QA_FLAGS_IGNORED="usr/bin/bazel" - -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() { - 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 -} - -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 - - # Use standalone strategy to deactivate the bazel sandbox, since it - # conflicts with FEATURES=sandbox. - cat > "${T}/bazelrc" <<-EOF || die - build --verbose_failures - build --spawn_strategy=standalone --genrule_strategy=standalone - - build --distdir="${S}/derived/distdir/" - build --jobs=$(makeopts_jobs) $(bazel-get-flags) - - 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() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) --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 - fi -} diff --git a/dev-util/bazel/bazel-0.27.2.ebuild b/dev-util/bazel/bazel-0.27.2.ebuild deleted file mode 100644 index 95740e9606ea..000000000000 --- a/dev-util/bazel/bazel-0.27.2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 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() { - 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 -} - -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 - - eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" - eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" -} - -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-0.29.1.ebuild b/dev-util/bazel/bazel-0.29.1.ebuild deleted file mode 100644 index 95740e9606ea..000000000000 --- a/dev-util/bazel/bazel-0.29.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 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() { - 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 -} - -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 - - eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" - eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" -} - -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.0.1.ebuild b/dev-util/bazel/bazel-1.0.1.ebuild deleted file mode 100644 index 25dd653392af..000000000000 --- a/dev-util/bazel/bazel-1.0.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 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() { - 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 -} - -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 - - eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" - eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" -} - -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 deleted file mode 100644 index 95740e9606ea..000000000000 --- a/dev-util/bazel/bazel-1.2.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 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() { - 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 -} - -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 - - eapply "${FILESDIR}/${PN}-0.24.1-rename-gettid-functions.patch" - eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" -} - -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-2.0.1.ebuild b/dev-util/bazel/bazel-2.0.1.ebuild deleted file mode 100644 index 426d7485ab0d..000000000000 --- a/dev-util/bazel/bazel-2.0.1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 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() { - 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 -} - -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 - - eapply "${FILESDIR}/${PN}-0.22.0-include-limits-for-gcc-11.patch" -} - -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-3.2.0.ebuild b/dev-util/bazel/bazel-3.2.0.ebuild deleted file mode 100644 index ba0583025946..000000000000 --- a/dev-util/bazel/bazel-3.2.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 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 prefix static-libs" -REQUIRED_USE="prefix? ( static-libs )" -# 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() { - 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 -} - -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 - - eapply "${FILESDIR}/${P}-include-limits-for-gcc-11.patch" -} - -src_compile() { - export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk" - if use static-libs; then - export BAZEL_LINKOPTS=-static-libs:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm - fi - 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-3.7.2-r1.ebuild b/dev-util/bazel/bazel-3.7.2-r1.ebuild index 161e10ad821a..db3f1fbbb8c0 100644 --- a/dev-util/bazel/bazel-3.7.2-r1.ebuild +++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +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) @@ -66,6 +66,7 @@ src_prepare() { addpredict /proc eapply "${FILESDIR}/${PN}-3.2.0-include-limits-for-gcc-11.patch" + eapply "${FILESDIR}/${PN}-3.7.2-musl-temp-failure-retry.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 deleted file mode 100644 index e05c2263de06..000000000000 --- a/dev-util/bazel/files/bazel-0.22.0-include-limits-for-gcc-11.patch +++ /dev/null @@ -1,125 +0,0 @@ -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 - - #include -+#include - - #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 -+ - 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 - -+#include - #include - #include - #include -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 -+#include - - #include - #include -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 - #include -+#include - - 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 -+#include -+ - 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 - #include - -+#include -+ - 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 - #include - -+#include -+ - 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 - - -+#include -+ - 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 - - #include -+#include - - #include - #include 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 deleted file mode 100644 index 0450300c2c90..000000000000 --- a/dev-util/bazel/files/bazel-0.22.0-rename-gettid-functions.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 - #include - --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 - #include - --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 deleted file mode 100644 index 39cf94d94695..000000000000 --- a/dev-util/bazel/files/bazel-0.24.1-rename-gettid-functions.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 - #include - --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(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 - #include - --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.7.2-musl-temp-failure-retry.patch b/dev-util/bazel/files/bazel-3.7.2-musl-temp-failure-retry.patch new file mode 100644 index 000000000000..4c8648bb639f --- /dev/null +++ b/dev-util/bazel/files/bazel-3.7.2-musl-temp-failure-retry.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/815907 +https://github.com/bazelbuild/bazel/commit/bcce6dd026e90336e80616a8c1004a79a2f8640c + +From: philwo +Date: Thu, 20 May 2021 08:13:09 -0700 +Subject: [PATCH] Add the TEMP_FAILURE_RETRY macro to linux-sandbox-pid1.cc. + +This allows us to build Bazel on Linux systems which use a C standard library that does not include this macro, like Alpine Linux (which uses musl). + +Fixes #12460. + +PiperOrigin-RevId: 374873483 +--- a/src/main/tools/linux-sandbox-pid1.cc ++++ b/src/main/tools/linux-sandbox-pid1.cc +@@ -49,6 +49,19 @@ + #include + #endif + ++#ifndef TEMP_FAILURE_RETRY ++// Some C standard libraries like musl do not define this macro, so we'll ++// include our own version for compatibility. ++#define TEMP_FAILURE_RETRY(exp) \ ++ ({ \ ++ decltype(exp) _rc; \ ++ do { \ ++ _rc = (exp); \ ++ } while (_rc == -1 && errno == EINTR); \ ++ _rc; \ ++ }) ++#endif // TEMP_FAILURE_RETRY ++ + #include "src/main/tools/linux-sandbox-options.h" + #include "src/main/tools/linux-sandbox.h" + #include "src/main/tools/logging.h" diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml index d29756de7565..e36c237bc2ce 100644 --- a/dev-util/bazel/metadata.xml +++ b/dev-util/bazel/metadata.xml @@ -1,9 +1,6 @@ - - zmedico@gentoo.org - perfinion@gentoo.org @@ -19,6 +16,5 @@ Install extra bazel tools to build from sources - Link libstdc++ statically -- cgit v1.2.3