>From 2f180c7ff8f44e92bdef3ebd9a70381b30b04fa9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <or...@cora.nwra.com>
Date: Mon, 30 Nov 2015 16:17:10 -0700
Subject: Add patch for gsl 2 support
---
perl-PDL-gsl.patch | 39 +++++++++++++++++++++++++++++++++++++++
perl-PDL.spec | 9 ++++++++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 perl-PDL-gsl.patch
diff --git a/perl-PDL-gsl.patch b/perl-PDL-gsl.patch
new file mode 100644
index 0000000..93869e1
--- /dev/null
+++ b/perl-PDL-gsl.patch
@@ -0,0 +1,39 @@
+diff -up PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd.gsl
PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
+--- PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd.gsl 2015-08-11
19:44:20.000000000 -0600
++++ PDL-2.015/Lib/GSL/SF/ellint/gsl_sf_ellint.pd 2015-11-30
15:50:16.162825309 -0700
+@@ -82,6 +82,10 @@ $e() = r.err;
+ Doc =>'Legendre form of incomplete elliptic integrals P(phi,k,n) =
Integral[(1 + n Sin[t]^2)^(-1)/Sqrt[1 - k^2 Sin[t]^2], {t, 0, phi}]'
+ );
+
++my $v = `gsl-config --version`;
++
++if($v < 2.0) {
++
+ pp_def('gsl_sf_ellint_D',
+ GenericTypes => [D],
+ Pars=>'double phi(); double k(); double n();
+@@ -95,6 +99,24 @@ $e() = r.err;
+ Doc =>'Legendre form of incomplete elliptic integrals D(phi,k,n)'
+ );
+
++}
++else {
++
++pp_def('gsl_sf_ellint_D',
++ GenericTypes => [D],
++ Pars=>'double phi(); double k();
++ double [o]y(); double [o]e()',
++ Code =>'
++gsl_sf_result r;
++GSLERR(gsl_sf_ellint_D_e,($phi(),$k(),GSL_PREC_DOUBLE,&r))
++$y() = r.val;
++$e() = r.err;
++',
++ Doc =>'Legendre form of incomplete elliptic integrals D(phi,k)'
++ );
++
++}
++
+ pp_def('gsl_sf_ellint_RC',
+ GenericTypes => [D],
+ Pars=>'double x(); double yy(); double [o]y(); double [o]e()',
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 804356b..e839556 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -11,7 +11,7 @@
Name: perl-PDL
%global cpan_version 2.015
Version: 2.15.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Perl Data Language
Group: Development/Libraries
License: GPL+ or Artistic
@@ -26,6 +26,9 @@ Patch2: PDL-2.4.10-Disable-PDL-GIS-Proj.patch
Patch3: PDL-2.6.0.90-Compile-Slatec-code-as-PIC.patch
# Disable Slatec code crashing on PPC64, bug #1041304
Patch4: PDL-2.14.0-Disable-PDL-Slatec.patch
+# GSL 2 support
+# https://sourceforge.net/p/pdl/bugs/407/
+Patch5: perl-PDL-gsl.patch
BuildRequires: coreutils
BuildRequires: fftw2-devel
BuildRequires: findutils
@@ -172,6 +175,7 @@ such commercial packages as IDL and MatLab.
%if %{without slatec}
%patch4 -p1 -b .slatec
%endif
+%patch5 -p1 -b .gsl
# Fix shellbang
sed -e 's,^#!/usr/bin/env perl,%(perl -MConfig -e 'print
$Config{startperl}'),' -i Perldl2/pdl2
@@ -210,6 +214,9 @@ make test
%{_mandir}/man3/*.3*
%changelog
+* Mon Nov 30 2015 Orion Poplawski <or...@cora.nwra.com> - 2.15.0-2
+- Add patch for gsl 2 support
+
* Mon Nov 23 2015 Jitka Plesnikova <jples...@redhat.com> - 2.15.0-1
- 2.015 bump
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-PDL.git/commit/?h=master&id=2f180c7ff8f44e92bdef3ebd9a70381b30b04fa9
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
