dev-util/bazel: add upstream musl patch

Closes: https://bugs.gentoo.org/815907
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-11-24 02:19:47 +00:00
parent e4c0465029
commit ac00d0d8ce
2 changed files with 35 additions and 0 deletions

View File

@@ -66,6 +66,7 @@ src_prepare() {
addpredict /proc
eapply "${FILESDIR}/${PN}-3.2.0-include-limits-for-gcc-11.patch"
eapply "${FILESDIR}/${PN}-3.7.2-musl-temp-failure-retry.patch"
}
src_compile() {

View File

@@ -0,0 +1,34 @@
https://bugs.gentoo.org/815907
https://github.com/bazelbuild/bazel/commit/bcce6dd026e90336e80616a8c1004a79a2f8640c
From: philwo <philwo@google.com>
Date: Thu, 20 May 2021 08:13:09 -0700
Subject: [PATCH] Add the TEMP_FAILURE_RETRY macro to linux-sandbox-pid1.cc.
This allows us to build Bazel on Linux systems which use a C standard library that does not include this macro, like Alpine Linux (which uses musl).
Fixes #12460.
PiperOrigin-RevId: 374873483
--- a/src/main/tools/linux-sandbox-pid1.cc
+++ b/src/main/tools/linux-sandbox-pid1.cc
@@ -49,6 +49,19 @@
#include <linux/fs.h>
#endif
+#ifndef TEMP_FAILURE_RETRY
+// Some C standard libraries like musl do not define this macro, so we'll
+// include our own version for compatibility.
+#define TEMP_FAILURE_RETRY(exp) \
+ ({ \
+ decltype(exp) _rc; \
+ do { \
+ _rc = (exp); \
+ } while (_rc == -1 && errno == EINTR); \
+ _rc; \
+ })
+#endif // TEMP_FAILURE_RETRY
+
#include "src/main/tools/linux-sandbox-options.h"
#include "src/main/tools/linux-sandbox.h"
#include "src/main/tools/logging.h"