diff --git a/ppl-0.10.1-Makefile.patch b/ppl-0.10.1-Makefile.patch deleted file mode 100644 index 307e5c7..0000000 --- a/ppl-0.10.1-Makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -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@ diff --git a/ppl-0.10.2-Makefile.patch b/ppl-0.10.2-Makefile.patch new file mode 100644 index 0000000..307e5c7 --- /dev/null +++ b/ppl-0.10.2-Makefile.patch @@ -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@ diff --git a/ppl.hh b/ppl.hh index cab2c54..53d4d13 100644 --- a/ppl.hh +++ b/ppl.hh @@ -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 diff --git a/ppl.spec b/ppl.spec index 6d7e855..351a883 100644 --- a/ppl.spec +++ b/ppl.spec @@ -1,7 +1,7 @@ #%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ppl -Version: 0.10.1 +Version: 0.10.2 Release: 1%{?dist} Summary: The Parma Polyhedra Library: a library of numerical abstractions @@ -12,7 +12,7 @@ Source0: ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{vers Source1: ppl.hh Source2: ppl_c.h Source3: pwl.hh -Patch0: ppl-0.10.1-Makefile.patch +Patch0: ppl-0.10.2-Makefile.patch #Patch1: #Icon: #Requires: @@ -106,6 +106,7 @@ 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. @@ -226,7 +227,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 +236,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 @@ -405,6 +410,9 @@ mv \ rm -rf %{buildroot} %changelog +* Sat Apr 18 2009 Roberto Bagnara 0.10.2-1 +- Updated for PPL 0.10.2. + * Tue Apr 14 2009 Roberto Bagnara 0.10.1-1 - Updated for PPL 0.10.1. diff --git a/ppl_c.h b/ppl_c.h index 4c579da..dc62d50 100644 --- a/ppl_c.h +++ b/ppl_c.h @@ -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 diff --git a/pwl.hh b/pwl.hh index c51a858..a89f27d 100644 --- a/pwl.hh +++ b/pwl.hh @@ -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