Fix building with pl 8.x. Fix C++11 detection.
This commit is contained in:
parent
882a5716b4
commit
64be304658
10
ppl.spec
10
ppl.spec
|
@ -14,6 +14,7 @@ BuildRequires: perl-interpreter
|
||||||
BuildRequires: perl(Getopt::Long)
|
BuildRequires: perl(Getopt::Long)
|
||||||
BuildRequires: perl(strict)
|
BuildRequires: perl(strict)
|
||||||
BuildRequires: perl(warnings)
|
BuildRequires: perl(warnings)
|
||||||
|
BuildRequires: sharutils
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Parma Polyhedra Library (PPL) is a library for the manipulation of
|
The Parma Polyhedra Library (PPL) is a library for the manipulation of
|
||||||
|
@ -127,13 +128,18 @@ Install this package if you want to program with the PPL.
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
# Adapt to SWI Prolog 8.x
|
||||||
|
sed -i 's/-dump-runtime-variables/-&/g' configure
|
||||||
|
|
||||||
|
# Fix detection of C++11 features
|
||||||
|
sed -i 's,== 201103L,>= 201103L,g' configure
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CPPFLAGS="-I%{_includedir}/glpk"
|
CPPFLAGS="-I`swipl --dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="\(.*\)";/\1/'`/include"
|
||||||
# This is the explicit list of arches gprolog supports
|
# This is the explicit list of arches gprolog supports
|
||||||
%ifarch x86_64 %{ix86} ppc alpha
|
%ifarch x86_64 %{ix86} ppc alpha
|
||||||
CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
|
CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
|
||||||
%endif
|
%endif
|
||||||
CPPFLAGS="$CPPFLAGS -I`swipl -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="\(.*\)";/\1/'`/include"
|
|
||||||
%configure --docdir=%{_datadir}/doc/%{name} --enable-shared --disable-rpath --enable-interfaces="cxx c gnu_prolog swi_prolog java" CPPFLAGS="$CPPFLAGS"
|
%configure --docdir=%{_datadir}/doc/%{name} --enable-shared --disable-rpath --enable-interfaces="cxx c gnu_prolog swi_prolog java" CPPFLAGS="$CPPFLAGS"
|
||||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
|
|
Loading…
Reference in New Issue