Fix build in GCC 10+

3 files changed, 59 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00930aa6d0d7..138fdf411884 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = spectral
 	pkgdesc = Signal processing techniques to select representative regions from Paraver traces (from BSC).
 	pkgver = 3.4.1.20180918
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
 	arch = i686
 	arch = x86_64
@@ -10,7 +10,9 @@ pkgbase = spectral
 	depends = libbsctools
 	depends = extrae
 	source = https://ftp.tools.bsc.es/spectral/spectral-3.4.1-src.tar.bz2
+	source = spectral-Build-fix-for-GCC-10-fno-common-default.patch
 	sha512sums = 5b6350cbc6800857d1eeec7b6061406e3d238c12078f90a1ab611f89865f4bf07ef01dd638d9f258e64dfeded3963bdb48fba142599c29b57ffbcb7a86ac72f4
+	sha512sums = 892fe4c0e41d8e847b7c77922b864ce9b9c43acf1259805c604e6fe9e614cdc25e4c5ea4f8dbcc0157bb72006b34e72411f4d776f14dd3c38c23accdf2bf92e0
 
 pkgname = spectral
 
diff --git a/PKGBUILD b/PKGBUILD
index 402d82bf7795..352d609e9dce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,21 @@
 pkgname='spectral'
 pkgdesc='Signal processing techniques to select representative regions from Paraver traces (from BSC).'
 pkgver='3.4.1.20180918'
-pkgrel='1'
+pkgrel='2'
 arch=('i686' 'x86_64')
 url='https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools'
 license=('GPL3')
 depends=(fftw libbsctools extrae)
-source=("https://ftp.tools.bsc.es/$pkgname/$pkgname-${pkgver%.*}-src.tar.bz2")
-sha512sums=(5b6350cbc6800857d1eeec7b6061406e3d238c12078f90a1ab611f89865f4bf07ef01dd638d9f258e64dfeded3963bdb48fba142599c29b57ffbcb7a86ac72f4)
+source=("https://ftp.tools.bsc.es/$pkgname/$pkgname-${pkgver%.*}-src.tar.bz2"
+        "spectral-Build-fix-for-GCC-10-fno-common-default.patch")
+sha512sums=(5b6350cbc6800857d1eeec7b6061406e3d238c12078f90a1ab611f89865f4bf07ef01dd638d9f258e64dfeded3963bdb48fba142599c29b57ffbcb7a86ac72f4
+            892fe4c0e41d8e847b7c77922b864ce9b9c43acf1259805c604e6fe9e614cdc25e4c5ea4f8dbcc0157bb72006b34e72411f4d776f14dd3c38c23accdf2bf92e0)
+
+prepare() {
+	cd "$srcdir/$pkgname-${pkgver%.*}"
+
+	patch -Np1 -i "$srcdir/spectral-Build-fix-for-GCC-10-fno-common-default.patch"
+}
 
 build() {
 	cd "$srcdir/$pkgname-${pkgver%.*}"
diff --git a/spectral-Build-fix-for-GCC-10-fno-common-default.patch b/spectral-Build-fix-for-GCC-10-fno-common-default.patch
new file mode 100644
index 000000000000..27fcfb2a524b
--- /dev/null
+++ b/spectral-Build-fix-for-GCC-10-fno-common-default.patch
@@ -0,0 +1,45 @@
+From bf4f033b34c35aa4eaeb61726c5872718dc0797a Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Tue, 12 May 2020 20:43:12 +0200
+Subject: [PATCH] Build fix for GCC 10+ (-fno-common default)
+
+See https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+---
+ src/cutter_2.7.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/cutter_2.7.c b/src/cutter_2.7.c
+index 167a1df..ec1d018 100644
+--- a/src/cutter_2.7.c
++++ b/src/cutter_2.7.c
+@@ -28,7 +28,7 @@ int num_tasks, usefull_tasks, init_task_counter;
+ unsigned int remFirstStates, remLastStates, first_time_caught;
+ 
+ /* Trace in and trace out */
+-FILE *infile, *outfile;
++extern FILE *infile, *outfile;
+ gzFile gzInfile;
+ 
+ /* Struct for the case of MAX_TRACE_SIZE */
+@@ -51,7 +51,8 @@ struct thread_info *first;
+ struct thread_info *last;
+ 
+ /* Parameters for showing percentage */
+-unsigned long long total_trace_size, current_readed_size;
++extern unsigned long long total_trace_size;
++unsigned long long current_readed_size;
+ static unsigned long total_cutter_iters = 0;
+ 
+ /* Vars for saving the HC that will appear on the trace */
+@@ -67,7 +68,7 @@ struct selected_tasks
+   int range;
+ };
+ 
+-struct selected_tasks wanted_tasks[MAX_SELECTED_TASKS];
++extern struct selected_tasks wanted_tasks[MAX_SELECTED_TASKS];
+ 
+ double cutter_last_showed = 0;
+ 
+-- 
+2.26.2
+