[arch-commits] Commit in bazel/repos/community-x86_64 (3 files)
Konstantin Gizdov
kgizdov at archlinux.org
Wed Oct 9 12:03:01 UTC 2019
Date: Wednesday, October 9, 2019 @ 12:03:00
Author: kgizdov
Revision: 514344
archrelease: copy trunk to community-x86_64
Added:
bazel/repos/community-x86_64/PKGBUILD
(from rev 514343, bazel/trunk/PKGBUILD)
bazel/repos/community-x86_64/grpc_rename_gettid.patch
(from rev 514343, bazel/trunk/grpc_rename_gettid.patch)
Deleted:
bazel/repos/community-x86_64/PKGBUILD
--------------------------+
PKGBUILD | 85 ++++++++++++++++++++++++---------------------
grpc_rename_gettid.patch | 78 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+), 39 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-09 12:02:33 UTC (rev 514343)
+++ PKGBUILD 2019-10-09 12:03:00 UTC (rev 514344)
@@ -1,39 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Co-Maintainer: Konstantin Gizdov <arch at kge.pw>
-# Contributor: Frederik Schwan <frederik dot schwan at linux dot com>
-# Contributor: Simon Legner <Simon.Legner at gmail.com>
-
-pkgname=bazel
-pkgver=0.29.1
-pkgrel=1
-pkgdesc='Correct, reproducible, and fast builds for everyone'
-arch=('x86_64')
-license=('Apache')
-url='https://bazel.io/'
-depends=('java-environment=12' 'libarchive' 'zip' 'unzip')
-makedepends=('git' 'protobuf' 'python')
-options=('!distcc' '!strip')
-source=("https://github.com/bazelbuild/bazel/releases/download/${pkgver}/bazel-${pkgver}-dist.zip"
- "https://github.com/bazelbuild/bazel/releases/download/${pkgver}/bazel-${pkgver}-dist.zip.sig")
-sha512sums=('4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d'
- 'SKIP')
-validpgpkeys=('71A1D0EFCFEB6281FD0437C93D5919B448457EE0')
-
-build() {
- env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh
- ./output/bazel build scripts:bazel-complete.bash
- cd output
- ./bazel shutdown
-}
-
-package() {
- install -Dm755 "${srcdir}/scripts/packages/bazel.sh" "${pkgdir}/usr/bin/bazel"
- install -Dm755 "${srcdir}/output/bazel" "${pkgdir}/usr/bin/bazel-real"
- install -Dm644 "${srcdir}/bazel-bin/scripts/bazel-complete.bash" "${pkgdir}/usr/share/bash-completion/completions/bazel"
- install -Dm644 "${srcdir}/scripts/zsh_completion/_bazel" "${pkgdir}/usr/share/zsh/site-functions/_bazel"
- mkdir -p "${pkgdir}/opt/bazel"
- for d in examples third_party tools; do
- cp -r "${srcdir}/${d}" "${pkgdir}/opt/bazel/"
- done
-}
-# vim:set ts=2 sw=2 et:
Copied: bazel/repos/community-x86_64/PKGBUILD (from rev 514343, bazel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-09 12:03:00 UTC (rev 514344)
@@ -0,0 +1,46 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Co-Maintainer: Konstantin Gizdov <arch at kge.pw>
+# Contributor: Frederik Schwan <frederik dot schwan at linux dot com>
+# Contributor: Simon Legner <Simon.Legner at gmail.com>
+
+pkgname=bazel
+pkgver=0.29.1
+pkgrel=2
+pkgdesc='Correct, reproducible, and fast builds for everyone'
+arch=('x86_64')
+license=('Apache')
+url='https://bazel.io/'
+depends=('java-environment=11' 'libarchive' 'zip' 'unzip')
+makedepends=('git' 'protobuf' 'python')
+options=('!distcc' '!strip')
+source=("https://github.com/bazelbuild/bazel/releases/download/${pkgver}/bazel-${pkgver}-dist.zip"
+ "https://github.com/bazelbuild/bazel/releases/download/${pkgver}/bazel-${pkgver}-dist.zip.sig"
+ 'grpc_rename_gettid.patch')
+sha512sums=('4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d'
+ 'SKIP'
+ '0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04')
+validpgpkeys=('71A1D0EFCFEB6281FD0437C93D5919B448457EE0')
+
+prepare() {
+ # fix gRPC: https://github.com/grpc/grpc/pull/18950
+ patch -Np0 -i "${srcdir}/grpc_rename_gettid.patch" -d third_party/grpc
+}
+
+build() {
+ env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh
+ ./output/bazel build scripts:bazel-complete.bash
+ cd output
+ ./bazel shutdown
+}
+
+package() {
+ install -Dm755 "${srcdir}/scripts/packages/bazel.sh" "${pkgdir}/usr/bin/bazel"
+ install -Dm755 "${srcdir}/output/bazel" "${pkgdir}/usr/bin/bazel-real"
+ install -Dm644 "${srcdir}/bazel-bin/scripts/bazel-complete.bash" "${pkgdir}/usr/share/bash-completion/completions/bazel"
+ install -Dm644 "${srcdir}/scripts/zsh_completion/_bazel" "${pkgdir}/usr/share/zsh/site-functions/_bazel"
+ mkdir -p "${pkgdir}/opt/bazel"
+ for d in examples third_party tools; do
+ cp -r "${srcdir}/${d}" "${pkgdir}/opt/bazel/"
+ done
+}
+# vim:set ts=2 sw=2 et:
Copied: bazel/repos/community-x86_64/grpc_rename_gettid.patch (from rev 514343, bazel/trunk/grpc_rename_gettid.patch)
===================================================================
--- grpc_rename_gettid.patch (rev 0)
+++ grpc_rename_gettid.patch 2019-10-09 12:03:00 UTC (rev 514344)
@@ -0,0 +1,78 @@
+From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson <benjamin at 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 | 4 ++--
+ src/core/lib/gpr/log_posix.cc | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git src/core/lib/gpr/log_linux.cc.orig src/core/lib/gpr/log_linux.cc
+index 561276f0c20..8b597b4cf2f 100644
+--- src/core/lib/gpr/log_linux.cc.orig 2019-06-21 10:42:13.235611417 -0400
++++ src/core/lib/gpr/log_linux.cc 2019-06-21 10:42:16.686608855 -0400
+@@ -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*
+ 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 src/core/lib/gpr/log_posix.cc.orig src/core/lib/gpr/log_posix.cc
+index b6edc14ab6b..2f7c6ce3760 100644
+--- src/core/lib/gpr/log_posix.cc.orig 2019-06-21 10:42:13.242611412 -0400
++++ src/core/lib/gpr/log_posix.cc 2019-06-21 10:42:22.794604319 -0400
+@@ -30,7 +30,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, ...) {
+@@ -85,7 +85,7 @@ void gpr_default_log(gpr_log_func_args*
+ char* prefix;
+ gpr_asprintf(&prefix, "%s%s.%09d %7tu %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 src/core/lib/iomgr/ev_epollex_linux.cc.orig src/core/lib/iomgr/ev_epollex_linux.cc
+index 08116b3ab53..76f59844312 100644
+--- src/core/lib/iomgr/ev_epollex_linux.cc.orig 2019-06-21 10:42:13.247611408 -0400
++++ src/core/lib/iomgr/ev_epollex_linux.cc 2019-06-21 10:42:29.767599141 -0400
+@@ -1150,7 +1150,7 @@ static void end_worker(grpc_pollset* pol
+ }
+
+ #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.
+@@ -1170,7 +1170,7 @@ static grpc_error* pollset_work(grpc_pol
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+- WORKER_PTR->originator = gettid();
++ WORKER_PTR->originator = sys_gettid();
+ #endif
+ if (grpc_polling_trace.enabled()) {
+ gpr_log(GPR_INFO,
More information about the arch-commits
mailing list