commit 5e0c631c55bb5c3628076c3404efe10379f31bf6
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Mon Dec 16 16:58:08 2013 +0100
Disable Slatec on PPC64
PDL-2.7.0-Disable-PDL-Slatec.patch | 31 +++++++++++++++++++++++++++++++
perl-PDL.spec | 17 ++++++++++++++++-
2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/PDL-2.7.0-Disable-PDL-Slatec.patch b/PDL-2.7.0-Disable-PDL-Slatec.patch
new file mode 100644
index 0000000..145c89c
--- /dev/null
+++ b/PDL-2.7.0-Disable-PDL-Slatec.patch
@@ -0,0 +1,31 @@
+From b7ba4415d0fa729d63632a7427e3db05a1808741 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx>
+Date: Mon, 16 Dec 2013 16:24:50 +0100
+Subject: [PATCH] Disable PDL::Slatec
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=1041304>
+
+Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx>
+---
+ perldl.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/perldl.conf b/perldl.conf
+index f8a0d55..7f0ec7c 100755
+--- a/perldl.conf
++++ b/perldl.conf
+@@ -141,7 +141,7 @@
+ # false -> don't use
+ # true -> force use
+
+- WITH_SLATEC => undef, # Leave it up to PDL to decide
++ WITH_SLATEC => 0, # Crashes on PPC64
+
+ # Whether or not to build the PDL::Minuit module
+ # false -> don't use
+--
+1.8.3.1
+
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 8dc6d2e..a6fe5e8 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -1,10 +1,17 @@
# Proj has proved not beeing compatible all the time, bug #839651
%{bcond_without proj}
+# Slatec does not work on PPC64 since 2.4.something
+%ifarch ppc64
+%{bcond_with slatec}
+%else
+%{bcond_without slatec}
+%endif
+
Name: perl-PDL
%global cpan_version 2.007
Version: 2.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Perl Data Language
Group: Development/Libraries
License: GPL+ or Artistic
@@ -17,6 +24,8 @@ Patch1: perl-PDL-2.4.7-hdf.patch
Patch2: PDL-2.4.10-Disable-PDL-GIS-Proj.patch
# Compile Slatec as PIC, needed for ARM
Patch3: PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
+# Disable Slatec code crashing on PPC64, bug #1041304
+Patch4: PDL-2.7.0-Disable-PDL-Slatec.patch
BuildRequires: fftw2-devel
BuildRequires: freeglut-devel
BuildRequires: gcc-gfortran
@@ -140,6 +149,9 @@ such commercial packages as IDL and MatLab.
%patch2 -p1 -b .proj
%endif
%patch3 -p1 -b .slatecpic
+%if %{without slatec}
+%patch4 -p1 -b .slatec
+%endif
# Fix shebang
sed -e 's,^#!/usr/bin/env perl,#!/usr/bin/perl,' -i Perldl2/pdl2
@@ -178,6 +190,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
+* Mon Dec 16 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 2.7.0-2
+- Disable Slatec on PPC64 (bug #1041304)
+
* Mon Dec 16 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 2.7.0-1
- 2.007 bump
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
