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

!9 解决gcc升级到gcc10后编译失败

Browse Source 
From: @zhangtao2020
Reviewed-by: @zhengzhenyu
Signed-off-by: @zhengzhenyu
This commit is contained in:
openeuler-ci-bot 2021-08-10 11:24:25 +00:00 committed by Gitee
commit 5e22525d6f
2 changed files with 114 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bazel.spec
View File

@ -1,12 +1,14 @@
%define __os_install_post %{nil}
Name: bazel
Version: 3.5.0
Release: 3
Release: 4
Summary: a fast, scalable, multi-language and extensible build system
License: Apache License 2.0
URL: https://www.bazel.build/
Source0: https://github.com/bazelbuild/bazel/releases/download/%{version}/bazel-%{version}-dist.zip
Patch1: fix-build-error-with-gcc10.patch
BuildRequires: java-11-openjdk-devel python3 zip unzip python3-unversioned-command gcc-g++
Requires: libstdc++ libgcc java-11-openjdk-devel python3 zip unzip python3-unversioned-command
@ -26,6 +28,7 @@ Extensible to your needs: Easily add support for new languages and platforms wit
%prep
unzip %{SOURCE0}
%patch1 -p1
%build
env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" bash ./compile.sh
@ -39,6 +42,9 @@ install -m755 output/bazel %{buildroot}%{_bindir}
%attr(0755,root,root) %{_bindir}/bazel
%changelog
* Mon 9 Aug 2021 zhangtao <zhangtao221@huawei.com> - 3.5.0-4
- fix build error with gcc10
* Tue Jul 13 2021 guoxiaoqi <guoxiaoqi2@huawei.com> - 3.5.0-3
- Not strip %{_bindir}/bazel after install

107
fix-build-error-with-gcc10.patch Normal file
View File

@ -0,0 +1,107 @@
From 0da3b3884873b057e04d135b33ac340f56aa6351 Mon Sep 17 00:00:00 2001
From: Yun Peng <pcloudy@google.com>
Date: Thu, 10 Sep 2020 17:15:51 +0200
Subject: [PATCH] Patch upb to fix build error with gcc 10
---
WORKSPACE | 14 ++++++++
third_party/grpc/BUILD | 2 +-
third_party/grpc/upb_gcc10_fix.patch | 51 ++++++++++++++++++++++++++++
3 files changed, 66 insertions(+), 1 deletion(-)
create mode 100644 third_party/grpc/upb_gcc10_fix.patch
diff --git a/WORKSPACE b/WORKSPACE
index 117dcb500dea..609ee77e595a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1056,6 +1056,20 @@ register_local_rc_exe_toolchains()
register_toolchains("//src/main/res:empty_rc_toolchain")
+# Patch upb for grpc due to https://github.com/bazelbuild/bazel/issues/12056
+# TODO: Remove the following after upgrading grpc to a newer version that's not affected by this issue.
+http_archive(
+ name = "upb",
+ sha256 = "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
+ patches = ["//third_party/grpc:upb_gcc10_fix.patch"],
+ patch_args = ["-p1"],
+ strip_prefix = "upb-9effcbcb27f0a665f9f345030188c0b291e32482",
+ urls = [
+ "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
+ "https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
+ ],
+)
+
http_archive(
name = "com_github_grpc_grpc",
urls = [
diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD
index 71fc09eec21b..88071553565c 100644
--- a/third_party/grpc/BUILD
+++ b/third_party/grpc/BUILD
@@ -18,7 +18,7 @@ load("//tools/distributions:distribution_rules.bzl", "distrib_java_import", "dis
licenses(["notice"]) # Apache v2
-exports_files(["grpc_1.26.0.patch"])
+exports_files(["grpc_1.26.0.patch", "upb_gcc10_fix.patch"])
package(default_visibility = ["//visibility:public"])
diff --git a/third_party/grpc/upb_gcc10_fix.patch b/third_party/grpc/upb_gcc10_fix.patch
new file mode 100644
index 000000000000..5f82d4ea43bb
--- /dev/null
+++ b/third_party/grpc/upb_gcc10_fix.patch
@@ -0,0 +1,51 @@
+commit 9bd23dab4240b015321a53c45b3c9e4847fbf020
+Author: Joshua Haberman <jhaberman@gmail.com>
+Date: Tue Apr 7 15:22:11 2020 -0700
+
+ Changed upb status to suit GCC10's warning about strncpy(). (#268)
+
+ Added tests for all cases. Also removed ellipses from truncated
+ messages, they were more trouble than they are worth.
+
+diff --git a/upb/upb.c b/upb/upb.c
+index cb2cdfd..258192d 100644
+--- a/upb/upb.c
++++ b/upb/upb.c
+@@ -11,17 +11,6 @@
+
+ #include "upb/port_def.inc"
+
+-/* Guarantee null-termination and provide ellipsis truncation.
+- * It may be tempting to "optimize" this by initializing these final
+- * four bytes up-front and then being careful never to overwrite them,
+- * this is safer and simpler. */
+-static void nullz(upb_status *status) {
+- const char *ellipsis = "...";
+- size_t len = strlen(ellipsis);
+- UPB_ASSERT(sizeof(status->msg) > len);
+- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len);
+-}
+-
+ /* upb_status *****************************************************************/
+
+ void upb_status_clear(upb_status *status) {
+@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; }
+ void upb_status_seterrmsg(upb_status *status, const char *msg) {
+ if (!status) return;
+ status->ok = false;
+- strncpy(status->msg, msg, sizeof(status->msg));
+- nullz(status);
++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1);
++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
+ }
+
+ void upb_status_seterrf(upb_status *status, const char *fmt, ...) {
+@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) {
+ if (!status) return;
+ status->ok = false;
+ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args);
+- nullz(status);
++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
+ }
+
+ /* upb_alloc ******************************************************************/