diff --git a/givaro-iszero.patch b/givaro-iszero.patch new file mode 100644 index 0000000..dff0100 --- /dev/null +++ b/givaro-iszero.patch @@ -0,0 +1,30 @@ +--- src/kernel/ring/modular-log16.h.orig 2016-07-30 03:42:59.000000000 -0600 ++++ src/kernel/ring/modular-log16.h 2016-10-20 16:27:04.102542506 -0600 +@@ -24,6 +24,7 @@ + #include "givaro/givarray0.h" + #include "givaro/givranditer.h" + #include "givaro/modular-general.h" ++#undef iszero + + namespace Givaro + { +--- src/library/vector/givvectordense.h.orig 2016-07-30 03:42:59.000000000 -0600 ++++ src/library/vector/givvectordense.h 2016-10-20 16:29:03.957898263 -0600 +@@ -21,6 +21,7 @@ + #include "givaro/givvectorsparse.h" + #include "givaro/givstoragedense.h" + #include "givaro/givelem.h" ++#undef iszero + namespace Givaro { + #pragma message "#warning this file will probably not compile" + +--- src/library/vector/givvectorsparse.h.orig 2016-07-30 03:42:59.000000000 -0600 ++++ src/library/vector/givvectorsparse.h 2016-10-20 16:29:27.779981403 -0600 +@@ -22,6 +22,7 @@ + #include "givaro/givvector.h" + #include "givaro/givstoragesparse.h" + #include "givaro/givelem.h" ++#undef iszero + namespace Givaro { + #pragma message "#warning this file will probably not compile" + diff --git a/givaro.spec b/givaro.spec index a9aca88..ff40f67 100644 --- a/givaro.spec +++ b/givaro.spec @@ -1,12 +1,15 @@ Name: givaro Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library for arithmetic and algebraic computations License: CeCILL-B URL: http://givaro.forge.imag.fr/ Source0: https://github.com/linbox-team/%{name}/archive/v%{version}.tar.gz +# Fix breakage caused by new ANSI C iszero macro +Patch0: %{name}-iszero.patch + BuildRequires: doxygen-latex BuildRequires: gcc-c++ BuildRequires: ghostscript-core @@ -42,6 +45,7 @@ The libraries and header files for using %{name} for development. %prep %setup -q +%patch0 # Remove parts of the configure script that select non-default architectures # and ABIs. @@ -117,6 +121,9 @@ make check %changelog +* Thu Oct 20 2016 Jerry James - 4.0.2-3 +- Fix breakage due to new iszero macro in glibc + * Tue Aug 23 2016 Dan HorĂ¡k - 4.0.2-2 - Fix test-ringarith failure on s390x