From 8c9d63d7f5106473b82abdb2ac9c0f8c65d26b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 25 Jun 2021 13:51:10 +0200 Subject: [PATCH 1/3] First step to add support for GSL 2.7. First step is to make perl Build.PL run. After this change I am able to run "perl Build.PL" and then "./Build" without failures. --- inc/Ver2Func.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/inc/Ver2Func.pm b/inc/Ver2Func.pm index 72e473c..7d495f2 100644 --- a/inc/Ver2Func.pm +++ b/inc/Ver2Func.pm @@ -397,7 +397,14 @@ my @ver2func = ( ^gsl_matrix_uint_scale_columns$ / ] + }, + "2.7" => { + new => [ + qw/ + / + ] } + ); my ( %index, @info, @versions ); From 24bab699643648eee078669d5f242374d09b4517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 25 Jun 2021 18:39:59 +0200 Subject: [PATCH 2/3] Fixes issue #231. --- swig/SparseMatrix.i | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swig/SparseMatrix.i b/swig/SparseMatrix.i index 0b2902e..2f480f4 100644 --- a/swig/SparseMatrix.i +++ b/swig/SparseMatrix.i @@ -10,6 +10,8 @@ %} #if MG_GSL_NUM_VERSION >= 002006 +// ignore gsl_spmatrix_uchar_norm1, gsl_spmatrix_char_norm1, ... + %rename("%(regex:/^gsl_spmatrix_.+_norm1$/$ignore/)s") ""; %include "gsl/gsl_spmatrix.h" %include "gsl/gsl_spmatrix_double.h" %include "gsl/gsl_spmatrix_complex_long_double.h" From f0a54b437641c40fe545b051dec1f61eee1781f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Fri, 25 Jun 2021 19:15:02 +0200 Subject: [PATCH 3/3] Only exclude the unsigned versions. According to new information only the unsigned versions of gsl_spmatrix's norm1 function are missing. --- swig/SparseMatrix.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swig/SparseMatrix.i b/swig/SparseMatrix.i index 2f480f4..5442473 100644 --- a/swig/SparseMatrix.i +++ b/swig/SparseMatrix.i @@ -11,7 +11,7 @@ #if MG_GSL_NUM_VERSION >= 002006 // ignore gsl_spmatrix_uchar_norm1, gsl_spmatrix_char_norm1, ... - %rename("%(regex:/^gsl_spmatrix_.+_norm1$/$ignore/)s") ""; + %rename("%(regex:/^gsl_spmatrix_u.*_norm1$/$ignore/)s") ""; %include "gsl/gsl_spmatrix.h" %include "gsl/gsl_spmatrix_double.h" %include "gsl/gsl_spmatrix_complex_long_double.h"