Hello community, here is the log from the commit of package ck for openSUSE:Factory checked in at 2019-10-30 14:48:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ck (Old) and /work/SRC/openSUSE:Factory/.ck.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ck" Wed Oct 30 14:48:40 2019 rev:5 rq:744096 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ck/ck.changes 2019-10-09 15:20:14.452377114 +0200 +++ /work/SRC/openSUSE:Factory/.ck.new.2990/ck.changes 2019-10-30 14:48:42.886239452 +0100 @@ -1,0 +2,7 @@ +Tue Oct 29 21:55:14 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix symbol name clash between glibc 2.30 and ck, add + ck-fix-gettid-glibc-clash.patch +- Reenable tests again + +------------------------------------------------------------------- New: ---- ck-fix-gettid-glibc-clash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ck.spec ++++++ --- /var/tmp/diff_new_pack.tfqvcq/_old 2019-10-30 14:48:43.862240489 +0100 +++ /var/tmp/diff_new_pack.tfqvcq/_new 2019-10-30 14:48:43.866240494 +0100 @@ -27,6 +27,8 @@ Source: http://concurrencykit.org/releases/ck-%{version}.tar.gz # PATCH-FIX-UPSTREAM https://github.com/concurrencykit/ck/issues/141 Patch0: ck-fix-j1.patch +# PATCH-FIX-UPSTREAM https://github.com/concurrencykit/ck/issues/147 +Patch1: ck-fix-gettid-glibc-clash.patch BuildRequires: pkgconfig ExcludeArch: s390 s390x @@ -59,6 +61,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build # not a normal autotool configure, can't use configure macro @@ -90,13 +93,7 @@ rm -rv %{buildroot}%{_libdir}/libck.a %check -# disable tests due to their issues with gcc9 -# regressions/ck_array/validate: -# In file included from serial.c:6: -# ../../common.h:272:1: error: static declaration of 'gettid' follows non-static declaration -# 272 | gettid(void) -# | ^~~~~~ -#make %{?_smp_mflags} check +make %{?_smp_mflags} check %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig ++++++ ck-fix-gettid-glibc-clash.patch ++++++ >From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001 From: Samy Al Bahra <[email protected]> Date: Tue, 29 Oct 2019 17:30:09 -0400 Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid. glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/). gettid will clash with the glibc-provided symbol. Remove the macro and instead move to a dedicated namespace. We go this route to avoid introducing unnecessary complexity to build. Fixes #147 --- regressions/common.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/regressions/common.h b/regressions/common.h index 6e53483d..9cdc690a 100644 --- a/regressions/common.h +++ b/regressions/common.h @@ -267,13 +267,11 @@ struct affinity { #define AFFINITY_INITIALIZER {0, 0} #ifdef __linux__ -#ifndef gettid static pid_t -gettid(void) +common_gettid(void) { return syscall(__NR_gettid); } -#endif /* gettid */ CK_CC_UNUSED static int aff_iterate(struct affinity *acb) @@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb) CPU_ZERO(&s); CPU_SET(c % CORES, &s); - return sched_setaffinity(gettid(), sizeof(s), &s); + return sched_setaffinity(common_gettid(), sizeof(s), &s); } CK_CC_UNUSED static int @@ -297,7 +295,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core) CPU_ZERO(&s); CPU_SET((*core) % CORES, &s); - return sched_setaffinity(gettid(), sizeof(s), &s); + return sched_setaffinity(common_gettid(), sizeof(s), &s); } #elif defined(__MACH__) CK_CC_UNUSED static int
