diff -Nru mcl-14-137+ds/debian/changelog mcl-14-137+ds/debian/changelog --- mcl-14-137+ds/debian/changelog 2020-06-29 09:54:16.000000000 +0000 +++ mcl-14-137+ds/debian/changelog 2020-07-22 13:32:45.000000000 +0000 @@ -1,3 +1,9 @@ +mcl (1:14-137+ds-9) unstable; urgency=medium + + * Fix FTBFS when using gcc-10 (Closes: #957525) + + -- Shayan Doust Wed, 22 Jul 2020 14:32:45 +0100 + mcl (1:14-137+ds-8) unstable; urgency=medium * Add myself as an uploader diff -Nru mcl-14-137+ds/debian/patches/02-wrong-interpreter-path.patch mcl-14-137+ds/debian/patches/02-wrong-interpreter-path.patch --- mcl-14-137+ds/debian/patches/02-wrong-interpreter-path.patch 2020-06-29 09:54:16.000000000 +0000 +++ mcl-14-137+ds/debian/patches/02-wrong-interpreter-path.patch 2020-07-22 13:32:45.000000000 +0000 @@ -1,6 +1,6 @@ +Description: wrong interpreter path + Purpose: Fix wrong path of perl interpreter Author: Philipp Benner -Purpose: Fix wrong path of perl interpreter - --- a/src/alien/oxygen/src/mcxdeblast +++ b/src/alien/oxygen/src/mcxdeblast @@ -1,4 +1,4 @@ diff -Nru mcl-14-137+ds/debian/patches/gcc-10-port.patch mcl-14-137+ds/debian/patches/gcc-10-port.patch --- mcl-14-137+ds/debian/patches/gcc-10-port.patch 1970-01-01 00:00:00.000000000 +0000 +++ mcl-14-137+ds/debian/patches/gcc-10-port.patch 2020-07-22 13:32:45.000000000 +0000 @@ -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 +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 + diff -Nru mcl-14-137+ds/debian/patches/series mcl-14-137+ds/debian/patches/series --- mcl-14-137+ds/debian/patches/series 2020-06-29 09:54:16.000000000 +0000 +++ mcl-14-137+ds/debian/patches/series 2020-07-22 13:32:45.000000000 +0000 @@ -1,3 +1,4 @@ +gcc-10-port.patch OCamlSupport.patch # 01-restrict-variables.patch 02-wrong-interpreter-path.patch