diff --git a/bazel-1.0.0-log-warning.patch b/bazel-1.0.0-log-warning.patch deleted file mode 100644 index 4262d68242e6cb8ded6037de6495d497b1ad2b6a..0000000000000000000000000000000000000000 --- a/bazel-1.0.0-log-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java.orig 2019-10-16 13:05:10.252727691 +0000 -+++ src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java 2019-10-16 13:05:17.957900302 +0000 -@@ -179,7 +179,7 @@ public final class StrictJavaDepsPlugin - log.error(diagnostic.pos(), Errors.ProcMessager(diagnostic.message())); - break; - case WARN: -- log.warning(diagnostic.pos(), Warnings.ProcMessager(diagnostic.message())); -+ //log.warning(diagnostic.pos(), Warnings.ProcMessager(diagnostic.message())); - break; - case OFF: // continue below - } diff --git a/bazel-4.2.1-dist.zip b/bazel-5.0.0-dist.zip similarity index 82% rename from bazel-4.2.1-dist.zip rename to bazel-5.0.0-dist.zip index f0d3fb4eb714f7b50bb9612f556578d3786910ce..1d698d6bd58006aa14aa394751342c85f688e584 100644 Binary files a/bazel-4.2.1-dist.zip and b/bazel-5.0.0-dist.zip differ diff --git a/bazel-gcc.patch b/bazel-gcc.patch deleted file mode 100644 index f7433331d0100cd582cf346de4cd152e7a3c6864..0000000000000000000000000000000000000000 --- a/bazel-gcc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./third_party/ijar/mapped_file_unix.cc.orig 2021-09-01 00:46:12.255510754 +0300 -+++ ./third_party/ijar/mapped_file_unix.cc 2021-09-01 00:46:47.039243899 +0300 -@@ -18,6 +18,8 @@ - #include - #include - -+#include -+#include - #include - - #include "third_party/ijar/mapped_file.h" ---- third_party/ijar/zlib_client.h.orig 2021-09-01 00:53:22.196194178 +0300 -+++ third_party/ijar/zlib_client.h 2021-09-01 00:52:20.869668731 +0300 -@@ -15,6 +15,8 @@ - #ifndef THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ - #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_ - -+#include -+#include - #include - - #include "third_party/ijar/common.h" diff --git a/bazel.spec b/bazel.spec index e0a133a36265ccac6953e0d476350403bb18fb05..822c0020ca815ab7d9ee4d0eadbb64b51adb1b8a 100644 --- a/bazel.spec +++ b/bazel.spec @@ -1,17 +1,13 @@ %define _disable_source_fetch 0 Name: bazel -Version: 4.2.1 +Version: 5.0.0 Release: 0 Summary: Correct, reproducible, and fast builds for everyone. License: Apache License 2.0 URL: http://bazel.io/ Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip -# FIXME: Java 11 log.warning generates backtrace -Patch1: bazel-1.0.0-log-warning.patch -Patch2: bazel-gcc.patch - # for folks with 'bazel' v1 package installed Conflicts: bazel Conflicts: bazel2 @@ -30,8 +26,6 @@ Correct, reproducible, and fast builds for everyone. %prep %setup -q -c -n bazel-%{version} -%patch1 -p0 -%patch2 -p0 %build 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 export TMPDIR=%{_tmppath} export CC=gcc export CXX=g++ -export EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS} --sandbox_debug --host_javabase=@local_jdk//:jdk --verbose_failures --subcommands --explain=build.log --show_result=2147483647" +export EXTRA_BAZEL_ARGS="${EXTRA_BAZEL_ARGS} --sandbox_debug --tool_java_runtime_version=local_jdk --verbose_failures --subcommands --explain=build.log --show_result=2147483647" env ./compile.sh env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/bazel-complete.bash @@ -85,7 +79,10 @@ env ./scripts/generate_bash_completion.sh --bazel=output/bazel --output=output/b %attr(0755,root,root) %{bashcompdir}/bazel %changelog -* Thu 23 Jun 2022 zhangshaoning - 4.2.1-0 +* Sat Oct 22 2022 Jincheng Miao - 5.0.0-0 +- Update version to 5.0.0 for TF-2.9 build + +* Thu Jun 22 2022 zhangshaoning - 4.2.1-0 - update version to 4.2.1 * Mon Aug 9 2021 zhangtao - 3.5.0-4