Nilesh Patra pushed to branch master at Debian Med / seaview
Commits: fdbef400 by Nilesh Patra at 2020-07-28T19:46:10+05:30 Fix gcc-10 FTBFS - - - - - 66a8a4cd by Nilesh Patra at 2020-07-28T19:47:01+05:30 compat version: 13 - - - - - 3 changed files: - debian/control - + debian/patches/fix-gcc10.patch - + debian/patches/series Changes: ===================================== debian/control ===================================== @@ -4,7 +4,7 @@ Uploaders: Charles Plessy <[email protected]>, Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), libfltk1.3-dev, libpng-dev, libxft-dev, ===================================== debian/patches/fix-gcc10.patch ===================================== @@ -0,0 +1,101 @@ +Author: Nilesh Patra <[email protected]> +Description: Append relevant attribute flag to prevent gcc-10 FTBFS +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=957783 +Last-Updated: July 28, 2020 + +--- a/csrc/dnapars.c ++++ b/csrc/dnapars.c +@@ -77,41 +77,41 @@ + /* function prototypes */ + + +-Char infilename[FNMLNGTH], outfilename[FNMLNGTH], intreename[FNMLNGTH], *outtreename, ++__attribute__((__common__)) Char infilename[FNMLNGTH], outfilename[FNMLNGTH], intreename[FNMLNGTH], *outtreename, + weightfilename[FNMLNGTH]; + char basechar[32]="ACMGRSVTWYHKDBNO???????????????"; +-node *root; +-long chars, col, msets, ith, njumble, jumb, maxtrees; ++extern node *root; ++__attribute__((__common__)) long chars, col, msets, ith, njumble, jumb, maxtrees; + /* chars = number of sites in actual sequences */ +-long inseed, inseed0; +-double threshold; +-boolean jumble, usertree, thresh, weights, thorough, rearrfirst, ++extern long inseed, inseed0; ++extern double threshold; ++__attribute__((__common__)) boolean jumble, usertree, thresh, weights, thorough, rearrfirst, + trout, progress, stepbox, ancseq, mulsets, justwts, firstset, mulf, + multf; + steptr oldweight; +-longer seed; +-pointarray treenode; /* pointers to all nodes in tree */ +-long *enterorder; ++extern longer seed; ++extern pointarray treenode; /* pointers to all nodes in tree */ ++extern long *enterorder; + long *zeros; + + /* local variables for Pascal maketree, propagated globally for C version: */ + +-long minwhich; ++extern long minwhich; + static double like, minsteps, bestyet, bestlike, bstlike2; +-boolean lastrearr, recompute; +-double nsteps[maxuser]; +-long **fsteps; +-node *there, *oldnufork; +-long *place; +-bestelm *bestrees; +-long *threshwt; ++extern boolean lastrearr, recompute; ++extern double nsteps[maxuser]; ++extern long **fsteps; ++__attribute__((__common__)) node *there, *oldnufork; ++extern long *place; ++extern bestelm *bestrees; ++extern long *threshwt; + baseptr nothing; +-gbases *garbage; +-node *temp, *temp1, *temp2, *tempsum, *temprm, *tempadd, *tempf, *tmp, *tmp1, ++__attribute__((__common__)) gbases *garbage; ++__attribute__((__common__)) node *temp, *temp1, *temp2, *tempsum, *temprm, *tempadd, *tempf, *tmp, *tmp1, + *tmp2, *tmp3, *tmprm, *tmpadd; +-boolean *names; ++extern boolean *names; + node *grbg; +-char *progname; ++__attribute__((__common__)) char *progname; + + + static void getoptions(int arg_maxtrees, dnapars_S_option s_option) +--- a/csrc/protpars.c ++++ b/csrc/protpars.c +@@ -127,7 +127,7 @@ + node *temp, *temp1; + Char ch; + aas tmpa; +-char *progname; ++__attribute__((__common__)) char *progname; + + /* Local variables for maketree, propagated globally for c version: */ + long minwhich; +--- a/csrc/phylip.h ++++ b/csrc/phylip.h +@@ -342,7 +342,7 @@ + /* Lower-triangular format. */ + #define MAT_LOWERTRI (MAT_LOWER | MAT_MACHINE) + +-boolean javarun; ++__attribute__((__common__)) boolean javarun; + + typedef long *steptr; + typedef long longer[6]; +@@ -363,7 +363,7 @@ + extern boolean ibmpc, ansi, tranvsp; + //extern naym *nayme; /* names of species */ + extern char* *nayme; /* names of species */ +-boolean firstplotblock; // for debugging BMP output ++extern boolean firstplotblock; // for debugging BMP output + + #define ebcdic EBCDIC + ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +fix-gcc10.patch View it on GitLab: https://salsa.debian.org/med-team/seaview/-/compare/27a720cb7d752c687ee858b11722f4fafdb7849e...66a8a4cdc5f17a48d8a4cc53fb78a57dd8874eb6 -- View it on GitLab: https://salsa.debian.org/med-team/seaview/-/compare/27a720cb7d752c687ee858b11722f4fafdb7849e...66a8a4cdc5f17a48d8a4cc53fb78a57dd8874eb6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
