This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pdl.
commit 803b15fd33f508c89de0e031b3378932cbcfd4be
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Jun 17 20:36:36 2016 +0200
Re-enable {minuit,slatec}_default_integer_8.patch.
---
debian/patches/minuit_default_integer_8.patch | 54 ++++++++++++++-------------
debian/patches/series | 4 +-
debian/patches/slatec_default_integer_8.patch | 24 +++++++-----
3 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/debian/patches/minuit_default_integer_8.patch
b/debian/patches/minuit_default_integer_8.patch
index 2089c10..88da223 100644
--- a/debian/patches/minuit_default_integer_8.patch
+++ b/debian/patches/minuit_default_integer_8.patch
@@ -1,7 +1,11 @@
-Index: pdl-2.007/Lib/Minuit/FCN.c
-===================================================================
---- pdl-2.007.orig/Lib/Minuit/FCN.c 2013-09-21 13:45:48.000000000 +0000
-+++ pdl-2.007/Lib/Minuit/FCN.c 2014-09-25 07:43:14.000000000 +0000
+Description: Use 64bit integers in Minuit module.
+ For the time being, always use 64bit integers in Fortran libs
+ slatec and minuit by default, as Debian perl packages switched
+ to ivsize=8 on all arches, implying a 64bit index type in PDL.
+Author: Henning Glawe <gla...@debian.org>
+
+--- a/Lib/Minuit/FCN.c
++++ b/Lib/Minuit/FCN.c
@@ -35,15 +35,15 @@
#endif
@@ -22,7 +26,7 @@ Index: pdl-2.007/Lib/Minuit/FCN.c
double* x;
I32 ax ;
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ void FCN(int* npar,double* grad,double*
pdl* pxval;
SV* pxvalsv;
@@ -31,11 +35,9 @@ Index: pdl-2.007/Lib/Minuit/FCN.c
PDL_Indx *pdims;
dSP;
-Index: pdl-2.007/Lib/Minuit/minuit.pd
-===================================================================
---- pdl-2.007.orig/Lib/Minuit/minuit.pd 2013-08-07 11:52:26.000000000
+0000
-+++ pdl-2.007/Lib/Minuit/minuit.pd 2014-09-25 08:33:12.469144306 +0000
-@@ -6,18 +6,18 @@
+--- a/Lib/Minuit/minuit.pd
++++ b/Lib/Minuit/minuit.pd
+@@ -6,18 +6,18 @@ pp_addhdr('
#include<string.h>
#include "FCN.c"
@@ -65,7 +67,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
');
# add C code to the section preceding
# the first MODULE keyword
-@@ -367,7 +367,7 @@
+@@ -94,7 +94,7 @@ sub mn_init{
');
pp_def('mninit',
@@ -74,7 +76,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
Code => 'MNINIT($P(a),$P(b),$P(c));
');
pp_addxs('','
-@@ -375,7 +375,7 @@
+@@ -102,7 +102,7 @@ void
mnseti(str)
char* str;
CODE:
@@ -83,7 +85,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
largo = strlen(str);
MNSETI(str,largo);
');
-@@ -388,14 +388,14 @@
+@@ -115,14 +115,14 @@ mnseti(str)
# ');
pp_def('mn_abre',
@@ -101,7 +103,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
Code => 'CIERRA($P(l));'
);
-@@ -449,9 +449,9 @@
+@@ -176,9 +176,9 @@ sub mn_def_pars{
');
pp_def('mnparm',
@@ -113,21 +115,21 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
MNPARM($P(a),$COMP(str),$P(b),$P(c),$P(d),$P(e),$P(ia),largo);
');
-@@ -487,10 +487,10 @@
+@@ -214,10 +214,10 @@ sub mn_excm{
');
pp_def('mnexcm',
- Pars =>'double a(n); int ia(); int [o] ib();',
-- OtherPars => 'char* str; SV* funcion; int numelem;',
+- OtherPars => 'char* str; SV* function; int numelem;',
+ Pars =>'double a(n); longlong ia(); longlong [o] ib();',
-+ OtherPars => 'char* str; SV* funcion; IV numelem;',
++ OtherPars => 'char* str; SV* function; IV numelem;',
Code => 'double zero;
- int largo; largo=strlen($COMP(str));
+ long largo; largo=strlen($COMP(str));
ene = $COMP(numelem);
zero = 0.0;
- mnfunname = $COMP(funcion);
-@@ -525,7 +525,7 @@
+ mnfunname = $COMP(function);
+@@ -252,7 +252,7 @@ pp_addpm('
');
pp_def('mnpout',
@@ -136,7 +138,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
OtherPars => 'SV* str;',
Code => 'STRLEN largo; SV* tempo; char* uuu;
tempo = SvRV($COMP(str));
-@@ -551,7 +551,7 @@
+@@ -278,7 +278,7 @@ pp_addpm('
}
');
pp_def('mnstat',
@@ -145,7 +147,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
Code => 'MNSTAT($P(a),$P(b),$P(c),$P(ia),$P(ib),$P(ic));
');
-@@ -579,7 +579,7 @@
+@@ -306,7 +306,7 @@ pp_addpm('
');
pp_def('mnemat',
Pars => 'double [o] mat(n,n);',
@@ -154,7 +156,7 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
MNEMAT($P(mat),&numrows);
');
-@@ -607,7 +607,7 @@
+@@ -334,7 +334,7 @@ pp_addpm('
}
');
pp_def('mnerrs',
@@ -163,14 +165,14 @@ Index: pdl-2.007/Lib/Minuit/minuit.pd
Code => 'MNERRS($P(ia),$P(a),$P(b),$P(c),$P(d));
');
-@@ -641,8 +641,8 @@
+@@ -368,8 +368,8 @@ pp_addpm('
');
pp_def('mncont',
- Pars => 'int ia(); int ib(); int ic(); double [o] a(n); double [o]
b(n); int [o] id();',
-- OtherPars => 'SV* funcion; int numelem;',
+- OtherPars => 'SV* function; int numelem;',
+ Pars => 'longlong ia(); longlong ib(); longlong ic(); double [o]
a(n); double [o] b(n); longlong [o] id();',
-+ OtherPars => 'SV* funcion; IV numelem;',
++ OtherPars => 'SV* function; IV numelem;',
Code => ' double zero;
zero = 0.0;
- mnfunname = $COMP(funcion);
+ mnfunname = $COMP(function);
diff --git a/debian/patches/series b/debian/patches/series
index 589d230..6fcd573 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
#callext_compile_options.patch
#testsuite_fixes.patch
-#slatec_default_integer_8.patch
-#minuit_default_integer_8.patch
doc_vendor_install.patch
spelling-errors.patch
pdl-cppflags.patch
dumper_gnukfreebsd.patch
doc_dirlist.patch
+slatec_default_integer_8.patch
+minuit_default_integer_8.patch
diff --git a/debian/patches/slatec_default_integer_8.patch
b/debian/patches/slatec_default_integer_8.patch
index f4fe40e..0218fcb 100644
--- a/debian/patches/slatec_default_integer_8.patch
+++ b/debian/patches/slatec_default_integer_8.patch
@@ -1,6 +1,12 @@
+Description: Use 64bit integers in Slatec module.
+ For the time being, always use 64bit integers in Fortran libs
+ slatec and minuit by default, as Debian perl packages switched
+ to ivsize=8 on all arches, implying a 64bit index type in PDL.
+Author: Henning Glawe <gla...@debian.org>
+
--- a/Lib/Slatec/slatec.pd
+++ b/Lib/Slatec/slatec.pd
-@@ -369,7 +369,7 @@
+@@ -364,7 +364,7 @@ sub defslatec {
(($_->[0] eq "Mat" or $_->[0] eq "FuncRet")
and join '',@{$_}[1,2,3]) or
(($_->[0] eq "IntFlag" or $_->[0] eq "FortranIndex" or $_->[0] eq
"CheckFlag")
@@ -9,7 +15,7 @@
die "Invalid ppars ",(join ',',@$_),"\n";
}
} @args2;
-@@ -417,12 +417,12 @@
+@@ -412,12 +412,12 @@ sub defslatec {
my @ifincode;
foreach ( @args2 ) {
if ( $_->[0] eq "Incfd" ) {
@@ -25,7 +31,7 @@
}
}
-@@ -502,7 +502,7 @@
+@@ -497,7 +497,7 @@ sub PDL::eigsys {
$h = float($h);
rs($h,
(my $eigval=PDL->null),
@@ -34,7 +40,7 @@
(my $fvone = PDL->null),(my $fvtwo = PDL->null),
(my $errflag=PDL->null)
);
-@@ -528,7 +528,7 @@
+@@ -523,7 +523,7 @@ sub PDL::matinv {
if(sum($info) > 0) {
barf("Uninvertible matrix given to inv: $m\n");
}
@@ -43,7 +49,7 @@
$m;
}
-@@ -540,7 +540,7 @@
+@@ -535,7 +535,7 @@ sub PDL::detslatec {
if(sum($info) > 0) {
barf("Uninvertible matrix given to inv: $m\n");
}
@@ -52,7 +58,7 @@
return $det->slice('(0)')*10**$det->slice('(1)');
}
-@@ -1569,12 +1569,12 @@
+@@ -1568,12 +1568,12 @@ Error status returned by C<$ierr>:
# bar runs across polynomial coefficients.
#
pp_def('polfit',
@@ -69,7 +75,7 @@
$GENERIC() zero = 0;
$TFD(polfit'.$uscore.',dpolft'.$uscore.')
(&$PRIV(__n_size),$P(x),$P(y),$P(w),$P(maxdeg),$P(ndeg),$P(eps),$P(r),$P(ierr),$P(a));
-@@ -1590,9 +1590,9 @@
+@@ -1589,9 +1589,9 @@ pp_def('polfit',
GenericTypes => ['F','D'],
HandleBad => 1,
NoBadifNaN => 1,
@@ -82,7 +88,7 @@
if($SIZE(n)<$maxdeg()) {
barf("polfit: Must have at least <n> points to fit <n>
coefficients");
}
-@@ -1613,9 +1613,9 @@
+@@ -1612,9 +1612,9 @@ pp_def('polfit',
$ierr() = 2;
} else {
/* Found enough good datapoints for a fit -- do the fit */
@@ -97,7 +103,7 @@
/* Do the fit */
--- a/t/slatec.t
+++ b/t/slatec.t
-@@ -237,7 +237,8 @@
+@@ -240,7 +240,8 @@ my $ismon;
( $ismon, $err ) = chcm($x, $f, $d, 1);
ok(($err->getndims==0) & ($err->sum == 0));
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/pdl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
