Control: tags -1 patch
On 22-11-15 21:33, Bas Couwenberg wrote:
> Your package fails to build with GSL 2:
>
> In file included from ELLINT.xs:39:0:
> ELLINT.xs: In function 'pdl_gsl_sf_ellint_D_readdata':
> ELLINT.xs:1720:8: error: too many arguments to function 'gsl_sf_ellint_D_e'
> GSLERR(gsl_sf_ellint_D_e,((phi_datap)[0] PDL_COMMENT("ACCESS()")
> ,(k_datap)[0] PDL_COMMENT("ACCESS()") ,(n_datap)[0] PDL_COMMENT("ACCESS()")
> ,GSL_PREC_DOUBLE,&r))
> ^
>
> This needs to be fixed for the ongoing gsl transition (#804246).
>
> The full build log is attached, as is a patch to update the build
> dependencies for GSL 2 (changing libgsl0-dev to libgsl-dev).
The upstream issue about this GSL 2.x build failure has a patch which
I've included in the pdl package to make build successfully with GSL 2.x.
Please include these changes in the next upload to unstable.
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
diff -Nru pdl-2.007/debian/changelog pdl-2.007/debian/changelog
--- pdl-2.007/debian/changelog 2014-12-17 11:02:50.000000000 +0100
+++ pdl-2.007/debian/changelog 2015-12-03 14:11:46.000000000 +0100
@@ -1,3 +1,11 @@
+pdl (1:2.007-4.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
+ * Add patch to fix FTBFS with GSL 2.x.
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 22 Nov 2015 21:06:28 +0100
+
pdl (1:2.007-4) unstable; urgency=high
* Fix "problems upgrading from wheezy due to triggers"; print warning
diff -Nru pdl-2.007/debian/control pdl-2.007/debian/control
--- pdl-2.007/debian/control 2013-11-08 23:24:31.000000000 +0100
+++ pdl-2.007/debian/control 2015-11-22 21:06:25.000000000 +0100
@@ -11,7 +11,7 @@
perl (>= 5.8.0-3),
debhelper (>= 9),
libinline-perl (>= 0.43),
- libgsl0-dev,
+ libgsl-dev,
libxext-dev,
libhdf4-alt-dev | libhdf4g-dev,
libproj-dev | proj,
diff -Nru pdl-2.007/debian/patches/gsl-2.patch
pdl-2.007/debian/patches/gsl-2.patch
--- pdl-2.007/debian/patches/gsl-2.patch 1970-01-01 01:00:00.000000000
+0100
+++ pdl-2.007/debian/patches/gsl-2.patch 2015-12-03 14:11:13.000000000
+0100
@@ -0,0 +1,44 @@
+Description: Add support for gsl_sf_ellint_D() call with GSL 2.x.
+Author: Sisyphus (http://sourceforge.net/u/userid-1195342/profile/)
+Origin:
http://sourceforge.net/p/pdl/bugs/_discuss/thread/24953813/f256/attachment/gsl_sf_ellint.pd.diff
+Bug: http://sourceforge.net/p/pdl/bugs/407/
+Bug-Debian: https://bugs.debian.org/805824
+
+--- a/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
++++ b/Lib/GSL/SF/ellint/gsl_sf_ellint.pd
+@@ -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 -Nru pdl-2.007/debian/patches/series pdl-2.007/debian/patches/series
--- pdl-2.007/debian/patches/series 2014-09-25 08:15:31.000000000 +0200
+++ pdl-2.007/debian/patches/series 2015-12-03 14:09:26.000000000 +0100
@@ -8,3 +8,4 @@
testsuite_fixes.patch
slatec_default_integer_8.patch
minuit_default_integer_8.patch
+gsl-2.patch
