mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-11-01 00:42:03 +01:00
testing/bazel4: add patches for GCC 11 FTBFS
This commit is contained in:
Jesse Chan
Kevin Daudt
parent
5ee63f37ea
commit
2efd9732b4
@ -28,6 +28,11 @@ source="https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkg
|
||||
patch_fix_jdk_13.patch
|
||||
patch_stop_hardcoding_verify_none_1.patch
|
||||
patch_stop_hardcoding_verify_none_2.patch
|
||||
patch_ftbfs_gcc11_1.patch
|
||||
patch_ftbfs_gcc11_2.patch
|
||||
patch_ftbfs_gcc11_3.patch
|
||||
patch_ftbfs_gcc11_4.patch
|
||||
patch_ftbfs_gcc11_5.patch
|
||||
patch_remove_illegal_reflective.patch"
|
||||
|
||||
build() {
|
||||
@ -124,5 +129,10 @@ fe1862bbd392f8a2d7af5f7c5e08fa6cf6dab0ba7b88280c28c4b072241613480e861af60212ceee
|
||||
0b4b3e541eaa496253e83d6fd88ba98d14c2a53324b7438f57d240b45f2c3c63b659038224e2b66706d4420eccb7c17c834260839f2fd39e3c6b3dea2613b735 patch_fix_jdk_13.patch
|
||||
f8456643419ac108a7cd72eaccd931e9c269c828611b0a62a79ad80a4f542b83cf5fa69af026e04bfb8d9f2c70527b5b25f9af56edb0a5a696ce66b3032df48d patch_stop_hardcoding_verify_none_1.patch
|
||||
c5ad25926e5672cd86b27c791c7347b21b57777296cc26d92d2bd9ae6eb39ee81d48008edb666285432135082e91daa9162ea67c719625bcede8f2d5647c9633 patch_stop_hardcoding_verify_none_2.patch
|
||||
992cf1acd662fd7e5f418e15122fd957c69bd6ca030b782b82d34222bec908d408472e839843b51fe828c2de5e56f4ff4cb4b4adcc17dacf82f2db7e9950cd64 patch_ftbfs_gcc11_1.patch
|
||||
e9d6e4642a25ce5323ba00e75172238fe52dc31e39ac91e97b5aae6deb9661c5426d763584e1b1b9ee489204e3bf891d84e14e7fa339c9a7a17a5a67c9129dc3 patch_ftbfs_gcc11_2.patch
|
||||
a001b7fe0bc7b34a6aab73e7f88a2f52dc5e67fcf3dda15bc06a6a8709b6ffa8883f705eb22ef83705fe70dfdbef64c5ff8ba762ffb526366b033375501e05e9 patch_ftbfs_gcc11_3.patch
|
||||
b83b73b5ea7a2fc99d13567f881dcfac3f242510ab429e33fe4347024fb9fbbd464fb7ef7ee4d380452b17c459d84494f993ba134db65c13f2a27ae475a5d8cc patch_ftbfs_gcc11_4.patch
|
||||
750c4ba2f41d61321db36c1d1154744e90d1b0f9ea39c75582edbdc28d16df2cee9c85fc4831114a414b6db8dba7b16d17b272b55a0308ac23a06242fc0c31db patch_ftbfs_gcc11_5.patch
|
||||
44a942c842688e53a431994e2cd7070d72a757fde1c45d44f3c0b349fd050692f0cac11f8b72fcf10cd944753a0ebc2038053a359ac7a1676125cc8107f04144 patch_remove_illegal_reflective.patch
|
||||
"
|
||||
|
||||
24
testing/bazel4/patch_ftbfs_gcc11_1.patch
Normal file
24
testing/bazel4/patch_ftbfs_gcc11_1.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 8cc0e261a313dbf5e81bfeca2bafa3e12a991046 Mon Sep 17 00:00:00 2001
|
||||
From: cushon <cushon@google.com>
|
||||
Date: Tue, 15 Dec 2020 23:18:55 -0800
|
||||
Subject: [PATCH] Include <limits>
|
||||
|
||||
Probably fixes https://github.com/bazelbuild/bazel/issues/12702
|
||||
|
||||
PiperOrigin-RevId: 347764132
|
||||
---
|
||||
third_party/ijar/zlib_client.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h
|
||||
index ed6616362fcc..c4b051e0100c 100644
|
||||
--- a/third_party/ijar/zlib_client.h
|
||||
+++ b/third_party/ijar/zlib_client.h
|
||||
@@ -16,6 +16,7 @@
|
||||
#define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
|
||||
|
||||
#include <limits.h>
|
||||
+#include <limits>
|
||||
|
||||
#include "third_party/ijar/common.h"
|
||||
|
||||
31
testing/bazel4/patch_ftbfs_gcc11_2.patch
Normal file
31
testing/bazel4/patch_ftbfs_gcc11_2.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From a129aeb333d83a4466ac2c996b84a113405acb4d Mon Sep 17 00:00:00 2001
|
||||
From: philwo <philwo@google.com>
|
||||
Date: Mon, 14 Jun 2021 09:10:07 -0700
|
||||
Subject: [PATCH] Fix #13575: FTBFS with GCC 11 on ARMv8
|
||||
|
||||
This supposedly fixes the compiler error reported by the user:
|
||||
|
||||
`error: 'numeric_limits' is not a member of 'std'`
|
||||
|
||||
Thanks to samcom12 for the report and suggested fix.
|
||||
|
||||
RELNOTES: None.
|
||||
PiperOrigin-RevId: 379291338
|
||||
---
|
||||
third_party/ijar/zlib_client.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h
|
||||
index c4b051e0100c..0a917ff0a99a 100644
|
||||
--- a/third_party/ijar/zlib_client.h
|
||||
+++ b/third_party/ijar/zlib_client.h
|
||||
@@ -16,7 +16,9 @@
|
||||
#define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
|
||||
|
||||
#include <limits.h>
|
||||
+
|
||||
#include <limits>
|
||||
+#include <stdexcept>
|
||||
|
||||
#include "third_party/ijar/common.h"
|
||||
|
||||
38
testing/bazel4/patch_ftbfs_gcc11_3.patch
Normal file
38
testing/bazel4/patch_ftbfs_gcc11_3.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 9761509f9ccc3892f42425b904adf1ef10bcb1f4 Mon Sep 17 00:00:00 2001
|
||||
From: David Ostrovsky <david@ostrovsky.org>
|
||||
Date: Wed, 16 Jun 2021 07:55:57 -0700
|
||||
Subject: [PATCH] Fix building on gcc 11
|
||||
|
||||
Fixes #12702.
|
||||
|
||||
Without this include the build is failing with:
|
||||
|
||||
third_party/ijar/mapped_file_unix.cc: In constructor 'devtools_ijar::MappedOutputFile::MappedOutputFile(const char*, size_t)':
|
||||
third_party/ijar/mapped_file_unix.cc:115:21: error: 'numeric_limits' is not a member of 'std'
|
||||
115 | std::numeric_limits<size_t>::max());
|
||||
| ^~~~~~~~~~~~~~
|
||||
|
||||
Closes #13537.
|
||||
|
||||
PiperOrigin-RevId: 379719635
|
||||
---
|
||||
third_party/ijar/mapped_file_unix.cc | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc
|
||||
index 6e3a90871844..65179e3290ec 100644
|
||||
--- a/third_party/ijar/mapped_file_unix.cc
|
||||
+++ b/third_party/ijar/mapped_file_unix.cc
|
||||
@@ -15,10 +15,11 @@
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
-#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
#include "third_party/ijar/mapped_file.h"
|
||||
|
||||
43
testing/bazel4/patch_ftbfs_gcc11_4.patch
Normal file
43
testing/bazel4/patch_ftbfs_gcc11_4.patch
Normal file
@ -0,0 +1,43 @@
|
||||
--- a/third_party/grpc/grpc_1.33.1.patch
|
||||
+++ b/third_party/grpc/grpc_1.33.1.patch
|
||||
@@ -58,6 +58,14 @@ index 09fcad95a2..9b737e5deb 100644
|
||||
)
|
||||
|
||||
native.bind(
|
||||
+@@ -245,6 +245,7 @@ def grpc_deps():
|
||||
+ "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",
|
||||
+ "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",
|
||||
+ ],
|
||||
++ patches = ["@com_github_grpc_grpc//:third_party/abseil-cpp/absl.patch"],
|
||||
+ )
|
||||
+
|
||||
+ if "bazel_toolchains" not in native.existing_rules():
|
||||
diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl
|
||||
index 4c1dfad2e8..f63c54ddef 100644
|
||||
--- a/bazel/grpc_extra_deps.bzl
|
||||
@@ -120,3 +128,25 @@ index c047f0c515..7c24fbc617 100644
|
||||
":windows": "@com_github_grpc_grpc//third_party/cares:config_windows/ares_config.h",
|
||||
":android": "@com_github_grpc_grpc//third_party/cares:config_android/ares_config.h",
|
||||
"//conditions:default": "@com_github_grpc_grpc//third_party/cares:config_linux/ares_config.h",
|
||||
+
|
||||
+--- /dev/null
|
||||
++++ b/third_party/abseil-cpp/absl.patch
|
||||
+@@ -0,0 +1,18 @@
|
||||
++0e2c62da1dcaf6529abab952bdcc96c6de2d9506 by Abseil Team <absl-team@google.com>:
|
||||
++
|
||||
++Add missing <limits> include
|
||||
++
|
||||
++PiperOrigin-RevId: 339054753
|
||||
++
|
||||
++--
|
||||
++
|
||||
++--- absl/synchronization/internal/graphcycles.cc
|
||||
+++++ absl/synchronization/internal/graphcycles.cc
|
||||
++@@ -37,6 +37,7 @@
|
||||
++
|
||||
++ #include <algorithm>
|
||||
++ #include <array>
|
||||
+++#include <limits>
|
||||
++ #include "absl/base/internal/hide_ptr.h"
|
||||
++ #include "absl/base/internal/raw_logging.h"
|
||||
++ #include "absl/base/internal/spinlock.h"
|
||||
34
testing/bazel4/patch_ftbfs_gcc11_5.patch
Normal file
34
testing/bazel4/patch_ftbfs_gcc11_5.patch
Normal file
@ -0,0 +1,34 @@
|
||||
--- a/tools/jdk/java_tools.patch
|
||||
+++ b/tools/jdk/java_tools.patch
|
||||
@@ -18,3 +18,31 @@
|
||||
}),
|
||||
)
|
||||
|
||||
+
|
||||
+--- java_tools/ijar/zlib_client.h
|
||||
++++ java_tools/ijar/zlib_client.h
|
||||
+@@ -16,6 +16,8 @@
|
||||
+ #define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
|
||||
+
|
||||
+ #include <limits.h>
|
||||
++#include <limits>
|
||||
++#include <stdexcept>
|
||||
+
|
||||
+ #include "third_party/ijar/common.h"
|
||||
+
|
||||
+
|
||||
+--- java_tools/ijar/mapped_file_unix.cc
|
||||
++++ java_tools/ijar/mapped_file_unix.cc
|
||||
+@@ -15,10 +15,11 @@
|
||||
+ #include <errno.h>
|
||||
+ #include <fcntl.h>
|
||||
+ #include <stdio.h>
|
||||
+-#include <unistd.h>
|
||||
+ #include <sys/mman.h>
|
||||
++#include <unistd.h>
|
||||
+
|
||||
+ #include <algorithm>
|
||||
++#include <limits>
|
||||
+
|
||||
+ #include "third_party/ijar/mapped_file.h"
|
||||
+
|
||||
Loading…
x
Reference in New Issue
Block a user