[med-svn] [Git][med-team/mcl][master] Fix FTBFS when using gcc-10

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / mcl


Commits:
8be79f89 by Shayan Doust at 2020-07-22T14:29:33+01:00
Fix FTBFS when using gcc-10

- - - - -


3 changed files:

- debian/patches/02-wrong-interpreter-path.patch
- + debian/patches/gcc-10-port.patch
- debian/patches/series


Changes:

=====================================
debian/patches/02-wrong-interpreter-path.patch
=====================================
@@ -1,6 +1,6 @@
+Description: wrong interpreter path
+ Purpose: Fix wrong path of perl interpreter
 Author: Philipp Benner <philipp at debian.org>
-Purpose: Fix wrong path of perl interpreter
-
 --- a/src/alien/oxygen/src/mcxdeblast
 +++ b/src/alien/oxygen/src/mcxdeblast
 @@ -1,4 +1,4 @@


=====================================
debian/patches/gcc-10-port.patch
=====================================
@@ -0,0 +1,37 @@
+Description: fixes FTBFS on gcc-10
+ A major change to gcc-10 migration is its default to -f-no-common. Instead of overriding and using 
+ the old behaviour (by using -fcommon), this patch uses the preferred method of fixing some 
+ declarations in the header files via the use of extern.
+Bug-Debian: https://bugs.debian.org/957525
+Author: Shayan Doust <hello at shayandoust.me> 
+Last-Update: 2020-07-22
+---
+
+Index: mcl/src/impala/iface.h
+===================================================================
+--- mcl.orig/src/impala/iface.h
++++ mcl/src/impala/iface.h
+@@ -16,15 +16,15 @@
+ 
+ /* This file currently provides nothing */
+ 
+-dim nu_meet_can  ;
+-dim nu_meet_sl   ;
+-dim nu_meet_zip  ;
+-dim nu_diff_can  ;
+-dim nu_diff_sl   ;
+-dim nu_diff_zip  ;
+-double nu_magic  ;
++extern dim nu_meet_can  ;
++extern dim nu_meet_sl   ;
++extern dim nu_meet_zip  ;
++extern dim nu_diff_can  ;
++extern dim nu_diff_sl   ;
++extern dim nu_diff_zip  ;
++extern double nu_magic  ;
+ 
+-dim mclx_n_thread_g  ;
++extern dim mclx_n_thread_g  ;
+ 
+ #endif
+ 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+gcc-10-port.patch
 OCamlSupport.patch
 # 01-restrict-variables.patch
 02-wrong-interpreter-path.patch



View it on GitLab: https://salsa.debian.org/med-team/mcl/-/commit/8be79f89c32d23ae38bf5bc3b8acc105a1e2f848

-- 
View it on GitLab: https://salsa.debian.org/med-team/mcl/-/commit/8be79f89c32d23ae38bf5bc3b8acc105a1e2f848
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/20200722/36048046/attachment-0001.html>