[arch-commits] Commit in bazel/repos/community-x86_64 (4 files)
Konstantin Gizdov
kgizdov at archlinux.org
Sat Jul 3 14:42:52 UTC 2021
Date: Saturday, July 3, 2021 @ 14:42:52
Author: kgizdov
Revision: 971940
archrelease: copy trunk to community-x86_64
Added:
bazel/repos/community-x86_64/PKGBUILD
(from rev 971939, bazel/trunk/PKGBUILD)
bazel/repos/community-x86_64/grpc_rename_gettid.patch
(from rev 971939, bazel/trunk/grpc_rename_gettid.patch)
Deleted:
bazel/repos/community-x86_64/PKGBUILD
bazel/repos/community-x86_64/grpc_rename_gettid.patch
--------------------------+
PKGBUILD | 84 ++++++++++++------------
grpc_rename_gettid.patch | 156 ++++++++++++++++++++++-----------------------
2 files changed, 123 insertions(+), 117 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-03 14:42:46 UTC (rev 971939)
+++ PKGBUILD 2021-07-03 14:42:52 UTC (rev 971940)
@@ -1,39 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# 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=4.0.0
-pkgrel=1
-pkgdesc='Correct, reproducible, and fast builds for everyone'
-arch=('x86_64')
-license=('Apache')
-url='https://bazel.build/'
-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")
-sha512sums=('7e89a26b78b0c18bd570618c7610d8de4f6beddbc751efdb5b9357d0309afbf5c83da6b6a367435ce1360361bd010b0987addb4270ba49737ba6b7e8d1f2bb98'
- 'SKIP')
-validpgpkeys=('71A1D0EFCFEB6281FD0437C93D5919B448457EE0')
-
-build() {
- EMBED_LABEL=$pkgver 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 971939, bazel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-07-03 14:42:52 UTC (rev 971940)
@@ -0,0 +1,45 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# 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=4.1.0
+pkgrel=1
+pkgdesc='Correct, reproducible, and fast builds for everyone'
+arch=('x86_64')
+license=('Apache')
+url='https://bazel.build/'
+depends=('java-environment=11' 'libarchive' 'zip' 'unzip')
+makedepends=('gcc10' '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=('18a8f4087b87e2d1dea118491458981bcb162ca736cc451169da9f638520071d846de77d32e4542a0142641f7e94d56d4cca7b0c17098d3d7dc67875528c634c'
+ 'SKIP')
+validpgpkeys=('71A1D0EFCFEB6281FD0437C93D5919B448457EE0')
+
+build() {
+ # https://github.com/bazelbuild/bazel/issues/13613
+ CC=/usr/bin/gcc-10 \
+ CXX=/usr/bin/g++-10 \
+ EMBED_LABEL=$pkgver EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" ./compile.sh
+ # https://github.com/bazelbuild/bazel/issues/13613
+ CC=/usr/bin/gcc-10 \
+ CXX=/usr/bin/g++-10 \
+ ./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:
Deleted: grpc_rename_gettid.patch
===================================================================
--- grpc_rename_gettid.patch 2021-07-03 14:42:46 UTC (rev 971939)
+++ grpc_rename_gettid.patch 2021-07-03 14:42:52 UTC (rev 971940)
@@ -1,78 +0,0 @@
-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,
Copied: bazel/repos/community-x86_64/grpc_rename_gettid.patch (from rev 971939, bazel/trunk/grpc_rename_gettid.patch)
===================================================================
--- grpc_rename_gettid.patch (rev 0)
+++ grpc_rename_gettid.patch 2021-07-03 14:42:52 UTC (rev 971940)
@@ -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