已开启
[sync] PR-17: 升级Bazel到5.0.0 #19
AtomGit-Bot创建于 2022年10月28日
[sync] PR-17: 升级Bazel到5.0.0 #19
已开启
共 4 个文件变更+6-42
| @@ -1,11 +0,0 @@ | |||
| 1 | ---- src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java.orig 2019-10-16 13:05:10.252727691 +0000 | ||
| 2 | -+++ src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java 2019-10-16 13:05:17.957900302 +0000 | ||
| 3 | -@@ -179,7 +179,7 @@ public final class StrictJavaDepsPlugin | ||
| 4 | - log.error(diagnostic.pos(), Errors.ProcMessager(diagnostic.message())); | ||
| 5 | - break; | ||
| 6 | - case WARN: | ||
| 7 | -- log.warning(diagnostic.pos(), Warnings.ProcMessager(diagnostic.message())); | ||
| 8 | -+ //log.warning(diagnostic.pos(), Warnings.ProcMessager(diagnostic.message())); | ||
| 9 | - break; | ||
| 10 | - case OFF: // continue below | ||
| 11 | - } | ||
| @@ -1,22 +0,0 @@ | |||
| 1 | ---- ./third_party/ijar/mapped_file_unix.cc.orig 2021-09-01 00:46:12.255510754 +0300 | ||
| 2 | -+++ ./third_party/ijar/mapped_file_unix.cc 2021-09-01 00:46:47.039243899 +0300 | ||
| 3 | -@@ -18,6 +18,8 @@ | ||
| 4 | - #include <unistd.h> | ||
| 5 | - #include <sys/mman.h> | ||
| 6 | - | ||
| 7 | -+#include <stdexcept> | ||
| 8 | -+#include <limits> | ||
| 9 | - #include <algorithm> | ||
| 10 | - | ||
| 11 | - #include "third_party/ijar/mapped_file.h" | ||
| 12 | ---- third_party/ijar/zlib_client.h.orig 2021-09-01 00:53:22.196194178 +0300 | ||
| 13 | -+++ third_party/ijar/zlib_client.h 2021-09-01 00:52:20.869668731 +0300 | ||
| 14 | -@@ -15,6 +15,8 @@ | ||
| 15 | - #ifndef THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ | ||
| 16 | - #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ | ||
| 17 | - | ||
| 18 | -+#include <stdexcept> | ||
| 19 | -+#include <limits> | ||
| 20 | - #include <limits.h> | ||
| 21 | - | ||
| 22 | - #include "third_party/ijar/common.h" | ||
| @@ -1,17 +1,13 @@ | |||
| 1 | %define _disable_source_fetch 0 | 1 | %define _disable_source_fetch 0 |
| 2 | 2 | ||
| 3 | Name: bazel | 3 | Name: bazel |
| 4 | -Version: 4.2.1 | 4 | +Version: 5.0.0 |
| 5 | Release: 0 | 5 | Release: 0 |
| 6 | Summary: Correct, reproducible, and fast builds for everyone. | 6 | Summary: Correct, reproducible, and fast builds for everyone. |
| 7 | License: Apache License 2.0 | 7 | License: Apache License 2.0 |
| 8 | URL: http://bazel.io/ | 8 | URL: http://bazel.io/ |
| 9 | Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip | 9 | Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip |
| 10 | 10 | ||
| 11 | -# FIXME: Java 11 log.warning generates backtrace | ||
| 12 | -Patch1: bazel-1.0.0-log-warning.patch | ||
| 13 | -Patch2: bazel-gcc.patch | ||
| 14 | - | ||
| 15 | # for folks with 'bazel' v1 package installed | 11 | # for folks with 'bazel' v1 package installed |
| 16 | Conflicts: bazel | 12 | Conflicts: bazel |
| 17 | Conflicts: bazel2 | 13 | Conflicts: bazel2 |
| @@ -30,8 +26,6 @@ Correct, reproducible, and fast builds for everyone. | |||
| 30 | 26 | ||
| 31 | %prep | 27 | %prep |
| 32 | %setup -q -c -n bazel-%{version} | 28 | %setup -q -c -n bazel-%{version} |
| 33 | -%patch1 -p0 | ||
| 34 | -%patch2 -p0 | ||
| 35 | 29 | ||
| 36 | %build | 30 | %build |
| 37 | find . -type f -regextype posix-extended -iregex '.*(sh|txt|py|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' -exec %{__sed} -i -e '1s|^#!/usr/bin/env python$|#!/usr/bin/env python3|' "{}" \; | 31 | find . -type f -regextype posix-extended -iregex '.*(sh|txt|py|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' -exec %{__sed} -i -e '1s|^#!/usr/bin/env python$|#!/usr/bin/env python3|' "{}" \; |
| @@ -64,7 +58,7 @@ g++ --version | |||
| 64 | export TMPDIR=%{_tmppath} | 58 | export TMPDIR=%{_tmppath} |
| 65 | export CC=gcc | 59 | export CC=gcc |
| 66 | export CXX=g++ | 60 | export CXX=g++ |
| 67 | -export EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS} --sandbox_debug --host_javabase=@local_jdk//:jdk --verbose_failures --subcommands --explain=build.log --show_result=2147483647" | 61 | +export EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS} --sandbox_debug --tool_java_runtime_version=local_jdk --verbose_failures --subcommands --explain=build.log --show_result=2147483647" |
| 68 | env ./compile.sh | 62 | env ./compile.sh |
| 69 | env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/bazel-complete.bash | 63 | env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/bazel-complete.bash |
| 70 | 64 | ||
| @@ -85,7 +79,10 @@ env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/b | |||
| 85 | %attr(0755,root,root) %{bashcompdir}/bazel | 79 | %attr(0755,root,root) %{bashcompdir}/bazel |
| 86 | 80 | ||
| 87 | %changelog | 81 | %changelog |
| 88 | -* Thu 23 Jun 2022 zhangshaoning <zhangshaoning@uniontech.com> - 4.2.1-0 | 82 | +* Sat Oct 22 2022 Jincheng Miao <jincheng.miao@intel.com> - 5.0.0-0 |
| 83 | +- Update version to 5.0.0 for TF-2.9 build | ||
| 84 | + | ||
| 85 | +* Thu Jun 22 2022 zhangshaoning <zhangshaoning@uniontech.com> - 4.2.1-0 | ||
| 89 | - update version to 4.2.1 | 86 | - update version to 4.2.1 |
| 90 | 87 | ||
| 91 | * Mon Aug 9 2021 zhangtao <zhangtao221@huawei.com> - 3.5.0-4 | 88 | * Mon Aug 9 2021 zhangtao <zhangtao221@huawei.com> - 3.5.0-4 |