Fix FTBFS with GCC 10

This commit is contained in:
wang_yue111 2021-08-07 16:18:59 +08:00
parent 17fe49377e
commit 858812fb26
2 changed files with 29 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: cufflinks
Version: 2.2.1
Release: 1
Release: 2
Summary: Transcriptome assembly and differential expression analysis for RNA-Seq.
License: GPL-3.0-only and BSL-1.0
@ -15,6 +15,7 @@ Patch4: 0005-fix_no_hash_member.patch
Patch5: 0006-format-security.patch
Patch6: 0007-py2to3.patch
Patch7: 0008-boost_bind_header.patch
Patch8: multiple-definition-linker-error.patch
BuildRequires: boost boost-serialization boost-system boost-thread boost-devel samtools samtools-devel htslib htslib-devel
BuildRequires: gcc gcc-c++ gcc-gfortran make autoconf gmp mpfr openmpi java-1.8.0-openjdk-headless
@ -61,5 +62,8 @@ find %{buildroot}/%{_bindir}/ -type f -name gffread -delete
%changelog
* Sat Aug 07 2021 wangyue <wangyue92@huawei.com> - 2.2.1-2
- Fix FTBFS with GCC 10
* Wed Mar 24 2021 He Rengui <herengui@uniontech.com> - 2.2.1-1
- Package init

View File

@ -0,0 +1,24 @@
From 8e89c64b095d114414a71d0eb62358c3bc21fd7e Mon Sep 17 00:00:00 2001
Author: Reiner Herrmann <reiner@reiner-h.de>
Description: Fix FTBFS with GCC 10 curwin is declared in different source file. declare it as extern to fix multiple definition linker error.
---
src/locfit/startlf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locfit/startlf.c b/src/locfit/startlf.c
index 6255410..f5435f7 100644
--- a/src/locfit/startlf.c
+++ b/src/locfit/startlf.c
@@ -233,7 +233,7 @@ INT (*vfun)(), nopc;
extern lfit lf;
extern design des;
extern plots pl[];
-int curwin;
+extern int curwin;
vari *vb;
INT nofit()
--
2.23.0