From 54c39837849438143e2e841617ea0d834bacaab2 Mon Sep 17 00:00:00 2001 From: pcpa Date: Mar 18 2016 15:19:33 +0000 Subject: Correct FTBFS in rawhide (#1307874) --- diff --git a/ppl-gcc6.patch b/ppl-gcc6.patch new file mode 100644 index 0000000..cd36cf5 --- /dev/null +++ b/ppl-gcc6.patch @@ -0,0 +1,42 @@ +diff -up ppl-1.1/demos/ppl_lcdd/ppl_lcdd.cc.orig ppl-1.1/demos/ppl_lcdd/ppl_lcdd.cc +--- ppl-1.1/demos/ppl_lcdd/ppl_lcdd.cc.orig 2016-03-17 17:48:24.795619726 -0300 ++++ ppl-1.1/demos/ppl_lcdd/ppl_lcdd.cc 2016-03-17 17:49:59.364623348 -0300 +@@ -224,7 +224,7 @@ std::istream* input_stream_p = 0; + + void + set_input(const char* file_name) { +- if (input_stream_p && *input_stream_p != std::cin) ++ if (input_stream_p && (void*)input_stream_p != (void*)&std::cin) + delete input_stream_p; + + if (file_name) { +@@ -250,7 +250,7 @@ std::ostream* output_stream_p = 0; + + void + set_output(const char* file_name) { +- if (output_stream_p && *output_stream_p != std::cout) ++ if (output_stream_p && (void*)output_stream_p != (void*)&std::cout) + delete output_stream_p; + + if (file_name) { +diff -up ppl-1.1/demos/ppl_pips/ppl_pips.cc.orig ppl-1.1/demos/ppl_pips/ppl_pips.cc +--- ppl-1.1/demos/ppl_pips/ppl_pips.cc.orig 2016-03-18 12:01:23.174424242 -0300 ++++ ppl-1.1/demos/ppl_pips/ppl_pips.cc 2016-03-18 12:02:23.743426561 -0300 +@@ -538,7 +538,7 @@ std::istream* input_stream_p = 0; + + void + set_input(const char* file_name) { +- if (input_stream_p && *input_stream_p != std::cin) ++ if (input_stream_p && (void*)input_stream_p != (void*)&std::cin) + delete input_stream_p; + + if (file_name) { +@@ -558,7 +558,7 @@ std::ostream* output_stream_p = 0; + + void + set_output(const char* file_name) { +- if (output_stream_p && *output_stream_p != std::cout) ++ if (output_stream_p && (void*)output_stream_p != (void*)&std::cout) + delete output_stream_p; + + if (file_name) { diff --git a/ppl.spec b/ppl.spec index 9d9d542..ffb234b 100644 --- a/ppl.spec +++ b/ppl.spec @@ -1,6 +1,6 @@ Name: ppl Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: The Parma Polyhedra Library: a library of numerical abstractions Group: Development/Libraries License: GPLv3+ @@ -22,6 +22,7 @@ Patch0: %{name}-cstddef.patch Patch1: %{name}-PlLong.patch Patch2: %{name}-gcc5.patch Patch3: %{name}-swiprolog.patch +Patch4: %{name}-gcc6.patch %description The Parma Polyhedra Library (PPL) is a library for the manipulation of @@ -156,6 +157,7 @@ Install this package if you want to program with the PPL. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build CPPFLAGS="-I%{_includedir}/glpk" @@ -307,6 +309,9 @@ mv \ %postun -p /sbin/ldconfig %changelog +* Fri Mar 18 2016 pcpa - 1.1-14 +- Correct FTBFS in rawhide (#1307874) + * Thu Feb 04 2016 Fedora Release Engineering - 1.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild