Compare commits

...

8 Commits

Author SHA1 Message Date
Roberto Bagnara 9b10b3848d Force rebuild. 2009-09-09 18:36:45 +00:00
Roberto Bagnara b2c234eb0b Force rebuild. 2009-08-21 12:20:35 +00:00
Roberto Bagnara ff1d357d1b Force rebuild. 2009-08-18 19:17:48 +00:00
Roberto Bagnara ef56081238 The `gprolog' and `yap' packages are not available on the sparc64 and
sparcv9 architectures: so do `ppl-gprolog', `ppl-gprolog-static' and
    `ppl-yap'.
2009-06-19 18:41:54 +00:00
Roberto Bagnara 1b72bd0ba5 Updated for PPL 0.10.2. 2009-04-18 09:36:53 +00:00
Roberto Bagnara 939631dd35 Updated for the PPL 0.10.1 sources. 2009-04-14 07:11:21 +00:00
Roberto Bagnara 34697a09cb Updated for PPL 0.10.1. 2009-04-14 07:09:31 +00:00
Jesse Keating 4f93c2ff1a Initialize branch F-10 for ppl 2008-11-07 04:40:43 +00:00
8 changed files with 162 additions and 64 deletions

View File

@ -1 +1 @@
ppl-0.10.tar.gz
ppl-0.10.2.tar.gz

1
branch Normal file
View File

@ -0,0 +1 @@
F-10

12
ppl-0.10.2-Makefile.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ur ppl-0.10.1/Watchdog/doc/Makefile.in ppl-0.10.1-patched/Watchdog/doc/Makefile.in
--- ppl-0.10.1/Watchdog/doc/Makefile.in 2000-04-11 10:36:59.000000000 +0100
+++ ppl-0.10.1-patched/Watchdog/doc/Makefile.in 2009-04-11 17:53:10.000000000 +0100
@@ -163,7 +163,7 @@
debug_flag = @debug_flag@
# All the documentation in docdir.
-docdir = @docdir@
+docdir = @docdir@/pwl
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@

8
ppl.hh
View File

@ -1,5 +1,5 @@
/* This is the header file switcher of the Parma Polyhedra Library.
Copyright (C) 2001-2008 Roberto Bagnara <bagnara@cs.unipr.it>
Copyright (C) 2001-2009 Roberto Bagnara <bagnara@cs.unipr.it>
This file is part of the Parma Polyhedra Library (PPL).
@ -38,6 +38,12 @@ site: http://www.cs.unipr.it/ppl/ . */
#include "ppl-s390x.hh"
#elif defined(__s390__)
#include "ppl-s390.hh"
#elif defined(__sh__)
#include "ppl-sh.hh"
#elif defined(__sparc__) && defined(__arch64__)
#include "ppl-sparc64.hh"
#elif defined(__sparc__)
#include "ppl-sparc.hh"
#else
#error "This architecture is not supported by the currently installed ppl-devel packages."
#endif

185
ppl.spec
View File

@ -1,8 +1,8 @@
#%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
Name: ppl
Version: 0.10
Release: 3%{?dist}
Version: 0.10.2
Release: 6%{?dist}
Summary: The Parma Polyhedra Library: a library of numerical abstractions
Group: Development/Libraries
@ -12,8 +12,8 @@ Source0: ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{vers
Source1: ppl.hh
Source2: ppl_c.h
Source3: pwl.hh
#Patch0: none
#Patch1: none
Patch0: ppl-0.10.2-Makefile.patch
#Patch1:
#Icon:
#Requires:
Requires(post): /sbin/ldconfig
@ -60,7 +60,7 @@ BuildRequires: glpk-devel >= 4.13
This package contains the mixed integer linear programming solver ppl_lpsol
and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra.
%ifnarch ppc64
%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9
%package gprolog
# The `gprolog' package is not available on ppc64:
# the GNU Prolog interface must thus be disabled for that architecture.
@ -73,7 +73,7 @@ This package adds GNU Prolog support to the Parma Polyhedra Library (PPL).
Install this package if you want to use the library in GNU Prolog programs.
%endif
%ifnarch ppc64
%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9
%package gprolog-static
Summary: The static archive for the GNU Prolog interface of the Parma Polyhedra Library
Group: Development/Libraries
@ -101,14 +101,17 @@ Requires: %{name}-swiprolog = %{version}-%{release}
This package contains the static archive for the SWI-Prolog interface
of the Parma Polyhedra Library.
%ifnarch sparc64 sparcv9
%package yap
Summary: The YAP Prolog interface of the Parma Polyhedra Library
Group: Development/Libraries
BuildRequires: yap-devel >= 5.1.1
Requires: %{name} = %{version}-%{release}, %{name}-pwl = %{version}-%{release}, yap >= 5.1.1
Obsoletes: ppl-yap-static
%description yap
This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
Install this package if you want to use the library in YAP Prolog programs.
%endif
#%package ocaml
#Summary: The OCaml interface of the Parma Polyhedra Library
@ -198,16 +201,18 @@ Install this package if you want to program with the PWL.
%prep
%setup -q
#%patch0 -p1
%patch0 -p1
#%patch1 -p1
%build
CPPFLAGS="-I%{_includedir}/glpk"
%ifnarch ppc64
%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9
CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
%endif
%ifnarch sparc64 sparcv9
CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
%configure --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
%endif
%configure --docdir=%{_datadir}/doc/%{name}-%{version} --enable-shared --disable-rpath --enable-interfaces="c++ c gnu_prolog swi_prolog yap_prolog java" CPPFLAGS="$CPPFLAGS"
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|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' Watchdog/libtool
@ -226,7 +231,8 @@ rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/%{name}/*.la
# the architecture for which the compiler is compiling.
# Since our header files only depend on the sizeof things, we smash
# ix86 onto i386 and arm* onto arm.
# ix86 onto i386 and arm* onto arm. For the SuperH RISC engine family,
# we smash sh3 and sh4 onto sh.
normalized_arch=%{_arch}
%ifarch %{ix86}
normalized_arch=i386
@ -234,6 +240,9 @@ normalized_arch=i386
%ifarch %{arm}
normalized_arch=arm
%endif
%ifarch sh3 sh4
normalized_arch=sh
%endif
mv %{buildroot}/%{_includedir}/ppl.hh %{buildroot}/%{_includedir}/ppl-${normalized_arch}.hh
install -m644 %{SOURCE1} %{buildroot}/%{_includedir}/ppl.hh
@ -245,27 +254,25 @@ install -m644 %{SOURCE3} %{buildroot}/%{_includedir}/pwl.hh
# Install the Javadocs for ppl-java.
mkdir -p %{buildroot}%{_javadocdir}
mv \
%{buildroot}/%{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}-html \
%{buildroot}/%{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}-html \
%{buildroot}%{_javadocdir}/%{name}-java
%files
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}/BUGS
%doc %{_datadir}/doc/%{name}/COPYING
%doc %{_datadir}/doc/%{name}/CREDITS
%doc %{_datadir}/doc/%{name}/ChangeLog
%doc %{_datadir}/doc/%{name}/NEWS
%doc %{_datadir}/doc/%{name}/README
%doc %{_datadir}/doc/%{name}/README.configure
%doc %{_datadir}/doc/%{name}/TODO
%doc %{_datadir}/doc/%{name}/gpl.*
%doc %{_datadir}/doc/%{name}-%{version}/BUGS
%doc %{_datadir}/doc/%{name}-%{version}/COPYING
%doc %{_datadir}/doc/%{name}-%{version}/CREDITS
%doc %{_datadir}/doc/%{name}-%{version}/NEWS
%doc %{_datadir}/doc/%{name}-%{version}/README
%doc %{_datadir}/doc/%{name}-%{version}/README.configure
%doc %{_datadir}/doc/%{name}-%{version}/TODO
%doc %{_datadir}/doc/%{name}-%{version}/gpl.txt
%{_libdir}/libppl.so.*
%{_libdir}/libppl_c.so.*
%{_bindir}/ppl-config
%{_mandir}/man1/ppl-config.1.gz
%dir %{_libdir}/%{name}
%dir %{_datadir}/doc/%{name}
%dir %{_datadir}/doc/%{name}-%{version}
%files devel
%defattr(-,root,root,-)
@ -290,7 +297,7 @@ mv \
%{_mandir}/man1/ppl_lcdd.1.gz
%{_mandir}/man1/ppl_lpsol.1.gz
%ifnarch ppc64
%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9
%files gprolog
%defattr(-,root,root,-)
%doc interfaces/Prolog/GNU/README.gprolog
@ -299,7 +306,7 @@ mv \
%{_libdir}/%{name}/libppl_gprolog.so
%endif
%ifnarch ppc64
%ifnarch ia64 ppc64 s390 s390x sparc64 sparcv9
%files gprolog-static
%defattr(-,root,root,-)
%{_libdir}/%{name}/libppl_gprolog.a
@ -316,11 +323,13 @@ mv \
%defattr(-,root,root,-)
%{_libdir}/%{name}/libppl_swiprolog.a
%ifnarch sparc64 sparcv9
%files yap
%defattr(-,root,root,-)
%doc interfaces/Prolog/YAP/README.yap
%{_libdir}/%{name}/ppl_yap.pl
%{_libdir}/%{name}/ppl_yap.so
%endif
#%files ocaml
#%defattr(-,root,root,-)
@ -346,33 +355,36 @@ mv \
%files docs
%defattr(-,root,root,-)
%doc %{_datadir}/doc/%{name}/README.doc
%doc %{_datadir}/doc/%{name}/fdl.*
%doc %{_datadir}/doc/%{name}/ppl-user-%{version}-html/
%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}-html/
#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}-html/
%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}-html/
%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.pdf
#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}/ppl-user-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}/ppl-user-c-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}/ppl-user-java-interface-%{version}.ps.gz
#%doc %{_datadir}/doc/%{name}/ppl-user-ocaml-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}/ppl-user-prolog-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ChangeLog*
%doc %{_datadir}/doc/%{name}-%{version}/README.doc
%doc %{_datadir}/doc/%{name}-%{version}/fdl.*
%doc %{_datadir}/doc/%{name}-%{version}/gpl.pdf
%doc %{_datadir}/doc/%{name}-%{version}/gpl.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}-html/
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}-html/
#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}-html/
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}-html/
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.pdf
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.pdf
#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.pdf
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-c-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-java-interface-%{version}.ps.gz
#%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-ocaml-interface-%{version}.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/ppl-user-prolog-interface-%{version}.ps.gz
%files pwl
%defattr(-,root,root,-)
%doc %{_datadir}/doc/pwl/BUGS
%doc %{_datadir}/doc/pwl/COPYING
%doc %{_datadir}/doc/pwl/CREDITS
%doc %{_datadir}/doc/pwl/ChangeLog
%doc %{_datadir}/doc/pwl/NEWS
%doc %{_datadir}/doc/pwl/README
%doc %{_datadir}/doc/pwl/gpl.*
%doc %{_datadir}/doc/%{name}-%{version}/pwl/BUGS
%doc %{_datadir}/doc/%{name}-%{version}/pwl/COPYING
%doc %{_datadir}/doc/%{name}-%{version}/pwl/CREDITS
%doc %{_datadir}/doc/%{name}-%{version}/pwl/NEWS
%doc %{_datadir}/doc/%{name}-%{version}/pwl/README
%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.txt
%{_libdir}/libpwl.so.*
%dir %{_datadir}/doc/%{name}-%{version}/pwl
%files pwl-devel
%defattr(-,root,root,-)
@ -386,11 +398,14 @@ mv \
%files pwl-docs
%defattr(-,root,root,-)
%doc %{_datadir}/doc/pwl/README.doc
%doc %{_datadir}/doc/pwl/fdl.*
%doc %{_datadir}/doc/pwl/pwl-user-0.5-html/
%doc %{_datadir}/doc/pwl/pwl-user-0.5.pdf
%doc %{_datadir}/doc/pwl/pwl-user-0.5.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/pwl/ChangeLog*
%doc %{_datadir}/doc/%{name}-%{version}/pwl/README.doc
%doc %{_datadir}/doc/%{name}-%{version}/pwl/fdl.*
%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.ps.gz
%doc %{_datadir}/doc/%{name}-%{version}/pwl/gpl.pdf
%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7-html/
%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.pdf
%doc %{_datadir}/doc/%{name}-%{version}/pwl/pwl-user-0.7.ps.gz
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -401,13 +416,65 @@ mv \
rm -rf %{buildroot}
%changelog
* Thu Nov 4 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-3
* Wed Sep 09 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.2-6
- Force rebuild.
* Fri Aug 21 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.2-5
- Force rebuild.
* Tue Aug 18 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.2-4
- Force rebuild.
* Fri Jun 19 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.2-3
- The `gprolog' and `yap' packages are not available on the sparc64 and
sparcv9 architectures: so do `ppl-gprolog', `ppl-gprolog-static' and
`ppl-yap'.
* Sat Apr 18 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.2-2
- Force rebuild.
* Sat Apr 18 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.2-1
- Updated for PPL 0.10.2.
* Tue Apr 14 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10.1-1
- Updated for PPL 0.10.1.
* Sun Mar 29 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-11
- Moved changelogs and PostScript and PDF versions of the GPL to the
`docs' subpackages. This saves considerable space on the live media.
* Tue Mar 24 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-10
- There are no GNU Prolog packages available on ia64: disable the GNU Prolog
interface also on those platforms (besides ppc64, s390 and s390x).
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild.
* Wed Feb 18 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-8
- Install the documentation according to the Fedora packaging conventions.
* Wed Feb 17 2009 Karsten Hopp <karsten@redhat.comt> 0.10-7
- There are no GNU Prolog packages available on s390 and s390x: disable
the GNU Prolog interface also on those platforms (besides ppc64).
* Wed Feb 04 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-6
- Better workaround for the bug affecting PPL 0.10 on big-endian
architectures.
* Tue Feb 03 2009 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-5
- Work around the bug affecting PPL 0.10 on big-endian architectures.
* Fri Dec 05 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-4
- Added `%%dir %%{_datadir}/doc/pwl' to the `%%files' section
of the `ppl-pwl' package.
* Thu Nov 04 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-3
- Fixed the requirements of the `ppl-java' package.
* Thu Nov 4 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-2
* Thu Nov 04 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-2
- Added m4 >= 1.4.8 to build requirements.
* Thu Nov 4 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-1
* Thu Nov 04 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.10-1
- Updated and extended for PPL 0.10. In particular, the `ppl-config'
program, being useful also for non-development activities, has been
brought back to the main package.
@ -415,17 +482,17 @@ rm -rf %{buildroot}
* Tue Sep 30 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-25
- The `swiprolog' package now requires pl >= 5.6.57-2.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-24
* Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-24
- Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
the `-v' option.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-23
* Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-23
- Fixed ppl-0.9-swiprolog.patch.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-22
* Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-22
- Implemented a workaround to cope with the new location of SWI-Prolog.h.
* Mon Sep 8 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-21
* Mon Sep 08 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-21
- Fixed the SWI-Prolog interface dependencies.
* Mon May 19 2008 Roberto Bagnara <bagnara@cs.unipr.it> 0.9-20

View File

@ -1,5 +1,5 @@
/* Header file switcher for the C interface. -*- C -*-
Copyright (C) 2001-2008 Roberto Bagnara <bagnara@cs.unipr.it>
Copyright (C) 2001-2009 Roberto Bagnara <bagnara@cs.unipr.it>
This file is part of the Parma Polyhedra Library (PPL).
@ -38,6 +38,12 @@ site: http://www.cs.unipr.it/ppl/ . */
#include "ppl_c-s390x.h"
#elif defined(__s390__)
#include "ppl_c-s390.h"
#elif defined(__sh__)
#include "ppl_c-sh.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "ppl_c-sparc64.h"
#elif defined(__sparc__)
#include "ppl_c-sparc.h"
#else
#error "This architecture is not supported by the currently installed ppl-devel packages."
#endif

8
pwl.hh
View File

@ -1,5 +1,5 @@
/* This is the header file switcher of the Parma Watchdog Library.
Copyright (C) 2001-2008 Roberto Bagnara <bagnara@cs.unipr.it>
Copyright (C) 2001-2009 Roberto Bagnara <bagnara@cs.unipr.it>
This file is part of the Parma Watchdog Library (PWL).
@ -38,6 +38,12 @@ site: http://www.cs.unipr.it/Software/ . */
#include "pwl-s390x.hh"
#elif defined(__s390__)
#include "pwl-s390.hh"
#elif defined(__sh__)
#include "pwl-sh.hh"
#elif defined(__sparc__) && defined(__arch64__)
#include "pwl-sparc64.hh"
#elif defined(__sparc__)
#include "pwl-sparc.hh"
#else
#error "This architecture is not supported by the currently installed ppl-pwl-devel packages."
#endif

View File

@ -1 +1 @@
610a60c9bda8a36bd41f90b732f906b3 ppl-0.10.tar.gz
e7dd265afdeaea81f7e87a72b182d875 ppl-0.10.2.tar.gz