From 366b485153507a622f747cbeb5e45ff9b6681be9 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 26 May 2020 14:32:55 -0600 Subject: [PATCH] - Fix configure test compromised by LTO. autoreconf after before configuring. Depend on automake and libtool. --- configure.patch | 16 ++++++++++++++++ ppl.spec | 12 ++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 configure.patch diff --git a/configure.patch b/configure.patch new file mode 100644 index 0000000..fd905d1 --- /dev/null +++ b/configure.patch @@ -0,0 +1,16 @@ +diff -Nrup a/m4/ac_check_fpu_control.m4 b/m4/ac_check_fpu_control.m4 +--- a/m4/ac_check_fpu_control.m4 2016-02-11 05:31:26.000000000 -0700 ++++ b/m4/ac_check_fpu_control.m4 2020-05-21 13:19:45.448773119 -0600 +@@ -49,9 +49,9 @@ main() { + + #else + +- float nf1 = -3, pf1 = 3, f2 = 5; +- double nd1 = -7, pd1 = 7, d2 = 11; +-long double nl1 = -13, pl1 = 13, l2 = 17; ++ volatile float nf1 = -3, pf1 = 3, f2 = 5; ++ volatile double nd1 = -7, pd1 = 7, d2 = 11; ++volatile long double nl1 = -13, pl1 = 13, l2 = 17; + + float nf[2], pf[2]; + double nd[2], pd[2]; diff --git a/ppl.spec b/ppl.spec index 790af5b..3999cf4 100644 --- a/ppl.spec +++ b/ppl.spec @@ -1,13 +1,16 @@ Name: ppl Version: 1.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: The Parma Polyhedra Library: a library of numerical abstractions License: GPLv3+ URL: http://www.bugseng.com/ppl Source0: http://www.bugseng.com/products/ppl/download/ftp/releases/%{version}/%{name}-%{version}.tar.bz2 Source1: ppl.hh Source2: ppl_c.h +Patch0: configure.patch BuildRequires: gcc-c++ +BuildRequires: automake +BuildRequires: libtool BuildRequires: gmp-devel BuildRequires: m4 BuildRequires: perl-interpreter @@ -122,7 +125,7 @@ using the Parma Polyhedra Library (PPL). Install this package if you want to program with the PPL. %prep -%autosetup +%autosetup -p1 # Adapt to SWI Prolog 8.x sed -i 's/-dump-runtime-variables/-&/g' configure @@ -131,6 +134,7 @@ sed -i 's/-dump-runtime-variables/-&/g' configure sed -i 's,== 201103L,>= 201103L,g' configure %build +autoreconf -fiv CPPFLAGS="-I`swipl --dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="\(.*\)";/\1/'`/include" # This is the explicit list of arches gprolog supports %ifarch x86_64 %{ix86} ppc alpha @@ -274,6 +278,10 @@ mv \ %doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.ps.gz %changelog +* Tue May 26 2020 Jeff Law - 1.2-15 +- Fix configure test compromised by LTO. autoreconf after + before configuring. Depend on automake and libtool. + * Mon May 4 2020 Jerry James - 1.2-14 - Use "javac -h" instead of javah with JDK 10 and later