Hello community, here is the log from the commit of package ck for openSUSE:Factory checked in at 2019-06-19 21:12:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ck (Old) and /work/SRC/openSUSE:Factory/.ck.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ck" Wed Jun 19 21:12:50 2019 rev:3 rq:710659 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ck/ck.changes 2018-07-06 10:45:11.495026476 +0200 +++ /work/SRC/openSUSE:Factory/.ck.new.4811/ck.changes 2019-06-19 21:13:36.914814518 +0200 @@ -1,0 +2,5 @@ +Tue Jun 18 07:41:39 UTC 2019 - Bernhard Wiedemann <[email protected]> + +- Add ck-fix-j1.patch to fix build with -j1 + +------------------------------------------------------------------- New: ---- ck-fix-j1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ck.spec ++++++ --- /var/tmp/diff_new_pack.elUYfb/_old 2019-06-19 21:13:38.086815713 +0200 +++ /var/tmp/diff_new_pack.elUYfb/_new 2019-06-19 21:13:38.086815713 +0200 @@ -26,6 +26,8 @@ Group: Development/Libraries/C and C++ URL: http://concurrencykit.org/ Source: http://concurrencykit.org/releases/ck-%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/concurrencykit/ck/issues/141 +Patch0: ck-fix-j1.patch BuildRequires: pkgconfig ExcludeArch: s390 s390x @@ -59,6 +61,7 @@ %prep %setup -q +%patch0 -p1 %build # not a normal autotool configure, can't use configure macro ++++++ ck-fix-j1.patch ++++++ https://github.com/concurrencykit/ck/issues/141 >From fd55609ca74c610285abe519babdf71f5a31e195 Mon Sep 17 00:00:00 2001 From: Olivier Houchard <[email protected]> Date: Mon, 17 Jun 2019 14:05:05 +0200 Subject: [PATCH] regression/ck_spinlock: Make sure CORES is at least 2 for ck_hclh. In ck_hclh, make sure CORES is at least 2, as we then attempt to create CORES / 2 locks. This fixes the test when compiling with -DCORES=1. --- regressions/ck_spinlock/ck_hclh.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/regressions/ck_spinlock/ck_hclh.h b/regressions/ck_spinlock/ck_hclh.h index eb2e6eb7..b4736052 100644 --- a/regressions/ck_spinlock/ck_hclh.h +++ b/regressions/ck_spinlock/ck_hclh.h @@ -2,6 +2,11 @@ #define LOCK_NAME "ck_clh" #define LOCK_DEFINE static ck_spinlock_hclh_t CK_CC_CACHELINE *glob_lock; \ static ck_spinlock_hclh_t CK_CC_CACHELINE *local_lock[CORES / 2] +#if CORES < 2 +#undef CORES +#define CORES 2 +#endif + #define LOCK_STATE ck_spinlock_hclh_t *na = malloc(MAX(sizeof(ck_spinlock_hclh_t), 64)) #define LOCK ck_spinlock_hclh_lock(&glob_lock, &local_lock[(core % CORES) / 2], na) #define UNLOCK ck_spinlock_hclh_unlock(&na)
