[med-svn] [Git][med-team/phast][master] 2 commits: Complete migration away from ATLAS

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / phast


Commits:
dec964f4 by Sébastien Villemot at 2023-12-22T15:09:14+01:00
Complete migration away from ATLAS

Most of the work had already been done in clapack.patch.

– remove inclusion of f2c.h and clapack.h
– no need to use LAPACKE
– no need to build depend on libf2c2-dev

- - - - -
8d3acd64 by Andreas Tille at 2023-12-22T16:22:00+00:00
Merge branch 'master' into 'master'

Complete migration away from ATLAS

See merge request med-team/phast!1
- - - - -


4 changed files:

- debian/control
- debian/patches/clapack.patch
- − debian/patches/lapacke.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -8,8 +8,6 @@ Build-Depends: debhelper-compat (= 13),
                libblas-dev | libblas.so,
                libtmglib-dev,
                libpcre2-dev,
-               libf2c2-dev,
-               liblapacke-dev,
                help2man
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/phast


=====================================
debian/patches/clapack.patch
=====================================
@@ -72,3 +72,18 @@ Forwarded: https://github.com/CshlSiepelLab/phast/issues/48
  
  # bypass
  else
+--- a/include/phast/external_libs.h
++++ b/include/phast/external_libs.h
+@@ -39,10 +39,8 @@
+ #else
+ 
+ #ifndef SKIP_LAPACK 
+-#include <f2c.h>  
+-#include <clapack.h> 
+-#define LAPACK_INT integer
+-#define LAPACK_DOUBLE doublereal
++#define LAPACK_INT int
++#define LAPACK_DOUBLE double
+ #endif  /*ifndef SKIP_LAPACK */
+ 
+ #endif  /*ifdef VECLIB */


=====================================
debian/patches/lapacke.patch deleted
=====================================
@@ -1,25 +0,0 @@
-Description: Use LAPACKE instead of clapack
-Bug-Debian: https://bugs.debian.org/1056681
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 29 Nov 2023 10:25:18 +0100
-
---- a/include/phast/external_libs.h
-+++ b/include/phast/external_libs.h
-@@ -10,7 +10,7 @@
- /*
-   
-   This file contains some definitions which are useful for linking to
--  external libraries (R, clapack, veclib)
-+  external libraries (R, lapacke, veclib)
- 
-  */
- 
-@@ -40,7 +40,7 @@
- 
- #ifndef SKIP_LAPACK 
- #include <f2c.h>  
--#include <clapack.h> 
-+#include <lapack.h> 
- #define LAPACK_INT integer
- #define LAPACK_DOUBLE doublereal
- #endif  /*ifndef SKIP_LAPACK */


=====================================
debian/patches/series
=====================================
@@ -5,4 +5,3 @@ use_debian_packaged_help2man.patch
 hardening.patch
 fix_test_makefile.patch
 pcre2.patch
-lapacke.patch



View it on GitLab: https://salsa.debian.org/med-team/phast/-/compare/77918a1c98a7da615291db3eee524cb7f470b5b6...8d3acd64c88c2461fb4d1d32d442074aafd84cd6

-- 
View it on GitLab: https://salsa.debian.org/med-team/phast/-/compare/77918a1c98a7da615291db3eee524cb7f470b5b6...8d3acd64c88c2461fb4d1d32d442074aafd84cd6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231222/b221cbac/attachment-0001.htm>