diff options
author | Julius Putra Tanu Setiaji <indocomsoft@gmail.com> | 2019-12-05 18:28:36 +0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2019-12-08 21:55:47 -0800 |
commit | 27d3e4549dfcbc89442c54b4e5c602b274284203 (patch) | |
tree | 096c918697c705f2f77a3ba0a1ad74c0900219cb /dev-util/bazel | |
parent | www-servers/puma: add 3.12.2 (diff) | |
download | gentoo-27d3e4549dfcbc89442c54b4e5c602b274284203.tar.gz gentoo-27d3e4549dfcbc89442c54b4e5c602b274284203.tar.bz2 gentoo-27d3e4549dfcbc89442c54b4e5c602b274284203.zip |
dev-util/bazel: Add gRPC patch for glibc 2.30
Closes: https://bugs.gentoo.org/701398
Closes: https://github.com/gentoo/gentoo/pull/13878
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Julius Putra Tanu Setiaji <indocomsoft@gmail.com>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'dev-util/bazel')
-rw-r--r-- | dev-util/bazel/bazel-1.2.0-r1.ebuild | 113 | ||||
-rw-r--r-- | dev-util/bazel/files/1.2.0-grpc-gettid.patch | 78 |
2 files changed, 191 insertions, 0 deletions
diff --git a/dev-util/bazel/bazel-1.2.0-r1.ebuild b/dev-util/bazel/bazel-1.2.0-r1.ebuild new file mode 100644 index 000000000000..5dce7b320590 --- /dev/null +++ b/dev-util/bazel/bazel-1.2.0-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 java-pkg-2 multiprocessing + +DESCRIPTION="Fast and correct automated build system" +HOMEPAGE="https://bazel.build/" + +SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="examples tools" +# strip corrupts the bazel binary +# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) +RESTRICT="strip test" +RDEPEND=">=virtual/jdk-1.8:*" +DEPEND="${RDEPEND} + app-arch/unzip + app-arch/zip" + +S="${WORKDIR}" + +PATCHES=( + "${FILESDIR}/${PV}-grpc-gettid.patch" +) + +bazel-get-flags() { + local i fs=() + for i in ${CFLAGS}; do + fs+=( "--copt=${i}" "--host_copt=${i}" ) + done + for i in ${CXXFLAGS}; do + fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) + done + for i in ${CPPFLAGS}; do + fs+=( "--copt=${i}" "--host_copt=${i}" ) + fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" ) + done + for i in ${LDFLAGS}; do + fs+=( "--linkopt=${i}" "--host_linkopt=${i}" ) + done + echo "${fs[*]}" +} + +pkg_setup() { + echo ${PATH} | grep -q ccache && \ + ewarn "${PN} usually fails to compile with ccache, you have been warned" + java-pkg-2_pkg_setup +} + +src_unpack() { + # Only unpack the main distfile + unpack ${P}-dist.zip +} + +src_prepare() { + default + + # F: fopen_wr + # S: deny + # P: /proc/self/setgroups + # A: /proc/self/setgroups + # R: /proc/24939/setgroups + # C: /usr/lib/systemd/systemd + addpredict /proc +} + +src_compile() { + export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk" + VERBOSE=yes ./compile.sh || die + + ./scripts/generate_bash_completion.sh \ + --bazel=output/bazel \ + --output=bazel-complete.bash \ + --prepend=scripts/bazel-complete-header.bash \ + --prepend=scripts/bazel-complete-template.bash +} + +src_test() { + output/bazel test \ + --verbose_failures \ + --spawn_strategy=standalone \ + --genrule_strategy=standalone \ + --verbose_test_summary \ + examples/cpp:hello-success_test || die + output/bazel shutdown +} + +src_install() { + dobin output/bazel + newbashcomp bazel-complete.bash ${PN} + bashcomp_alias ${PN} ibazel + insinto /usr/share/zsh/site-functions + doins scripts/zsh_completion/_bazel + + if use examples; then + docinto examples + dodoc -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi + # could really build tools but I don't know which ones + # are actually used + if use tools; then + docinto tools + dodoc -r tools/* + docompress -x /usr/share/doc/${PF}/tools + docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata + fi +} diff --git a/dev-util/bazel/files/1.2.0-grpc-gettid.patch b/dev-util/bazel/files/1.2.0-grpc-gettid.patch new file mode 100644 index 000000000000..c4de48068f11 --- /dev/null +++ b/dev-util/bazel/files/1.2.0-grpc-gettid.patch @@ -0,0 +1,78 @@ +From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 +From: Benjamin Peterson <benjamin@dropbox.com> +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689b..8b597b4cf2f 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include <string.h> + #include <time.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index c2d80c08ddb..4a83cb6c215 100644 +--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, |