[med-svn] [Git][med-team/igor][master] 4 commits: Fix gcc-10 build

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / igor


Commits:
87f4a27f by Andreas Tille at 2020-08-05T18:14:03+02:00
Fix gcc-10 build

- - - - -
deff76d5 by Andreas Tille at 2020-08-05T18:14:17+02:00
routine-update: debhelper-compat 13

- - - - -
251871a3 by Andreas Tille at 2020-08-05T18:46:08+02:00
Do not use outdated libcblas any more

- - - - -
bdcae5ab by Andreas Tille at 2020-08-05T18:53:10+02:00
Team-Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix-gcc-10.patch
- debian/patches/get_autoreconf_to_work.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+igor (1.4.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix gcc-10 build
+    Closes: #966868
+  * debhelper-compat 13 (routine-update)
+  * Do not use outdated libcblas any more
+
+ -- Andreas Tille <tille at debian.org>  Wed, 05 Aug 2020 18:37:57 +0200
+
 igor (1.4.0+dfsg-1) unstable; urgency=medium
 
   * Team Upload.


=====================================
debian/control
=====================================
@@ -3,11 +3,10 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Steffen Moeller <moeller at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libjemalloc-dev,
                libgsl-dev,
-               libatlas-base-dev | libcblas-dev
-# #Build-Depends-Indep: debhelper (>= 11),
+               libblas-dev | libblas.so
 # doxygen
 # asciidoc,
 Standards-Version: 4.5.0


=====================================
debian/patches/fix-gcc-10.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fix gcc-10 build
+Bug-Debian: https://bugs.debian.org/966868
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Wed, 05 Aug 2020 18:12:57 +0200
+
+--- a/igor_src/ExtractFeatures.cpp
++++ b/igor_src/ExtractFeatures.cpp
+@@ -23,6 +23,7 @@
+  *
+  */
+ 
++#include <string>
+ #include "ExtractFeatures.h"
+ 
+ ExtractFeatures::ExtractFeatures() {


=====================================
debian/patches/get_autoreconf_to_work.patch
=====================================
@@ -44,7 +44,7 @@ Description: Work around issues with creating manpage, use Debian packaged libs
 -
 -
 -igor_CXXFLAGS = -I$(srcdir)/../libs/jemalloc/include/jemalloc -I$(srcdir)/../libs/gsl_sub $(OPENMP_CXXFLAGS) -DIGOR_DATA_DIR=\"$(pkgdatadir)\"
-+igor_LDADD = -lgsl -lcblas -ljemalloc -lpthread -ldl #Need to link pthread since it is not statically linked with jemalloc (for now)
++igor_LDADD = -lgsl -lblas -ljemalloc -lpthread -ldl #Need to link pthread since it is not statically linked with jemalloc (for now)
  
 +igor_CXXFLAGS = -I/usr/include/jemalloc -I/usr/include/gsl $(OPENMP_CXXFLAGS) -DIGOR_DATA_DIR=\"$(pkgdatadir)\"
  


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 get_autoreconf_to_work.patch
 inline_fix.patch
+fix-gcc-10.patch



View it on GitLab: https://salsa.debian.org/med-team/igor/-/compare/8293fd8c044d3dc73def5d92685a224fd9ead547...bdcae5abb627fbff3d588eb3e27187a5f3473f84

-- 
View it on GitLab: https://salsa.debian.org/med-team/igor/-/compare/8293fd8c044d3dc73def5d92685a224fd9ead547...bdcae5abb627fbff3d588eb3e27187a5f3473f84
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/20200805/51722e56/attachment-0001.html>