From b80917974b96d8fc220616353baeb3f1244da16b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jun 09 2014 16:03:57 +0000 Subject: Add -volatile patch to fix test failure. Update time-related configure fix. --- diff --git a/check-0.9.13-volatile.patch b/check-0.9.13-volatile.patch new file mode 100644 index 0000000..a3decdc --- /dev/null +++ b/check-0.9.13-volatile.patch @@ -0,0 +1,11 @@ +--- ./src/check_run.c.orig 2014-05-29 21:58:32.000000000 -0600 ++++ ./src/check_run.c 2014-06-09 09:32:10.644294320 -0600 +@@ -230,7 +230,7 @@ static int srunner_run_unchecked_setup(S + TestResult *tr; + List *l; + Fixture *f; +- int rval = 1; ++ volatile int rval = 1; + + set_fork_status(CK_NOFORK); + diff --git a/check.spec b/check.spec index a419741..bcd6118 100644 --- a/check.spec +++ b/check.spec @@ -7,7 +7,9 @@ Group: Development/Tools License: LGPLv2+ URL: http://check.sourceforge.net/ # Only needed for autotools in Fedora 21+ -Patch0: check-0.9.11-info-in-builddir.patch +Patch0: %{name}-0.9.11-info-in-builddir.patch +# Result variable might be clobbered by longjmp() +Patch1: %{name}-0.9.13-volatile.patch BuildRequires: pkgconfig, libtool, autoconf, automake, subunit-devel BuildRequires: texinfo Requires(post): info @@ -51,10 +53,11 @@ programs suitable for use with the Check unit test framework. %if 0%{?fedora} >= 21 %patch0 -p1 -b .info-in-builddir %endif +%patch1 autoreconf -ivf # Fix detection of various time-related function declarations -sed -i '/"ac_cv_have_decl_clock_gettime"/iac_includes_default="$ac_includes_default\n#include "' configure +sed -i '/"ac_cv_have_decl_clock_gettime"/iac_includes_default="$ac_includes_default\n#include \n#include "' configure %build %configure @@ -116,6 +119,10 @@ fi %{_mandir}/man1/checkmk.1* %changelog +* Mon Jun 9 2014 Jerry James - 0.9.13-2 +- Add -volatile patch to fix test failure +- Update time-related configure fix + * Sat Jun 07 2014 Fedora Release Engineering - 0.9.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild