From 375c7b177560a93c0fc7a9fb573a70b234733dd7 Mon Sep 17 00:00:00 2001 From: Filip Januš Date: Feb 17 2020 14:12:18 +0000 Subject: Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1799226 Github issue: https://github.com/concurrencykit/ck/issues/153 Build fails on arm due to test ck_hclh.Test fails only with 5 cores This is temporary fix until upstream find solution --- diff --git a/ck.spec b/ck.spec index 70612d3..50a44f7 100644 --- a/ck.spec +++ b/ck.spec @@ -1,6 +1,6 @@ Name: ck Version: 0.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for high performance concurrent programming License: BSD @@ -9,6 +9,9 @@ URL: http://concurrencykit.org Source: http://concurrencykit.org/releases/ck-%{version}.tar.gz Patch1: ck-nogettid.patch Patch2: ck-register-constraint.patch +# disable ck_hclh_test from ck_spinlock temporary solution +# github issue: https://github.com/concurrencykit/ck/issues/153 +Patch3: ck_disable_ck_hclh_test.patch BuildRequires: gcc @@ -39,6 +42,7 @@ resources needed for developing Concurrency Kit applications. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="%{optflags}" @@ -74,6 +78,12 @@ make check %ldconfig_scriptlets %changelog +* Mon Feb 17 2020 Filip Januš - 0.7.0-3 +- Build fails due to ck_hclh test +- github issue: https://github.com/concurrencykit/ck/issues/153 +- resolves:https://bugzilla.redhat.com/show_bug.cgi?id=1799226 +- add patch - disables ck_hclh test + * Tue Jan 28 2020 Fedora Release Engineering - 0.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/ck_disable_ck_hclh_test.patch b/ck_disable_ck_hclh_test.patch new file mode 100644 index 0000000..d3bd174 --- /dev/null +++ b/ck_disable_ck_hclh_test.patch @@ -0,0 +1,38 @@ +Author: Filip Januš +Date: 17.2.2020 +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1799226 +Github issue: https://github.com/concurrencykit/ck/issues/153 + +Build fails on arm due to test ck_hclh.Test fails only with 5 cores +This is temporary fix until upstream find solution + +diff -ur ck-0.7.0/regressions/ck_spinlock/validate/Makefile ck-0.7.0_patch/regressions/ck_spinlock/validate/Makefile +--- ck-0.7.0/regressions/ck_spinlock/validate/Makefile 2019-02-20 21:13:02.000000000 +0100 ++++ ck-0.7.0_patch/regressions/ck_spinlock/validate/Makefile 2020-02-17 14:37:03.250804089 +0100 +@@ -1,7 +1,7 @@ + .PHONY: check clean + + all: ck_ticket ck_mcs ck_dec ck_cas ck_fas ck_clh linux_spinlock \ +- ck_ticket_pb ck_anderson ck_spinlock ck_hclh ++ ck_ticket_pb ck_anderson ck_spinlock + + check: all + ./ck_ticket $(CORES) 1 +@@ -10,7 +10,6 @@ + ./ck_cas $(CORES) 1 + ./ck_fas $(CORES) 1 + ./ck_clh $(CORES) 1 +- ./ck_hclh $(CORES) 1 + ./linux_spinlock $(CORES) 1 + ./ck_ticket_pb $(CORES) 1 + ./ck_anderson $(CORES) 1 +@@ -28,9 +27,6 @@ + ck_clh: ck_clh.c + $(CC) $(CFLAGS) -o ck_clh ck_clh.c + +-ck_hclh: ck_hclh.c +- $(CC) $(CFLAGS) -o ck_hclh ck_hclh.c +- + ck_anderson: ck_anderson.c + $(CC) $(CFLAGS) -o ck_anderson ck_anderson.c +