packages/bazel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!17 升级Bazel到5.0.0

Browse Source 
From: @wisespreading 
Reviewed-by: @zhunaipan 
Signed-off-by: @sinever
This commit is contained in:
openeuler-ci-bot 2022-10-28 09:30:28 +00:00 committed by Gitee
commit f7e6c26a48
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bazel-1.0.0-log-warning.patch
View File

@ -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
}

BIN
bazel-4.2.1-dist.zip → bazel-5.0.0-dist.zip
View File

Binary file not shown.

22
bazel-gcc.patch
View File

@ -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 <unistd.h>
#include <sys/mman.h>
+#include <stdexcept>
+#include <limits>
#include <algorithm>
#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 <stdexcept>
+#include <limits>
#include <limits.h>
#include "third_party/ijar/common.h"

15
bazel.spec
View File

@ -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 <zhangshaoning@uniontech.com> - 4.2.1-0
* Sat Oct 22 2022 Jincheng Miao <jincheng.miao@intel.com> - 5.0.0-0
- Update version to 5.0.0 for TF-2.9 build
* Thu Jun 22 2022 zhangshaoning <zhangshaoning@uniontech.com> - 4.2.1-0
- update version to 4.2.1
* Mon Aug 9 2021 zhangtao <zhangtao221@huawei.com> - 3.5.0-4