diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-libs/libmuscle/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-libs/libmuscle/files')
| -rw-r--r-- | sci-libs/libmuscle/files/3.7-bufferoverflow.patch | 22 | ||||
| -rw-r--r-- | sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch | 21 |
2 files changed, 43 insertions, 0 deletions
diff --git a/sci-libs/libmuscle/files/3.7-bufferoverflow.patch b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch new file mode 100644 index 000000000000..384f17acfbf4 --- /dev/null +++ b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch @@ -0,0 +1,22 @@ +--- a/libMUSCLE/globalslinux.cpp ++++ b/libMUSCLE/globalslinux.cpp +@@ -159,7 +159,7 @@ + }
+ return DEFAULT_RAM;
+ }
+- int Bytes = atoi(pMem+9)*1000;
++ long Bytes = atol(pMem+9)*1000;
+ return ((double) Bytes)/1e6;
+ }
+
+--- a/libMUSCLE/progress.cpp ++++ b/libMUSCLE/progress.cpp +@@ -48,7 +48,7 @@ + if (MB < 0)
+ return "";
+
+- static char Str[9];
++ static char Str[11];
+ static double MaxMB = 0;
+ static double RAMMB = 0;
+
diff --git a/sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch b/sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch new file mode 100644 index 000000000000..2b2c28c8132a --- /dev/null +++ b/sci-libs/libmuscle/files/libmuscle-3.7-fix-build-system.patch @@ -0,0 +1,21 @@ +* Make build system parallel buildable +* Remove -funroll-loops and friends + +--- a/libMUSCLE/Makefile.am ++++ b/libMUSCLE/Makefile.am +@@ -1,6 +1,4 @@ +-OPTIMIZATION = -O2 -Wall -funroll-loops -fomit-frame-pointer -ftree-vectorize -funsafe-math-optimizations +-AM_CXXFLAGS = $(OPTIMIZATION) -DNDEBUG=1 @OPENMP_CXXFLAGS@ +-AM_LDFLAGS = $(OPTIMIZATION) ++AM_CXXFLAGS = -DNDEBUG=1 @OPENMP_CXXFLAGS@ + + LIBMUSCLE_H = \ + alpha.h cluster.h clust.h clustsetdf.h clustset.h clustsetmsa.h diaglist.h distcalc.h distfunc.h dpregionlist.h dpreglist.h edgelist.h enumopts.h enums.h estring.h gapscoredimer.h gonnet.h intmath.h msadist.h msa.h muscle.h objscore.h params.h profile.h pwpath.h refine.h scorehistory.h seq.h seqvect.h textfile.h timing.h tree.h types.h unixio.h threadstorage.h +@@ -36,6 +34,6 @@ + + + muscle_SOURCES = main.cpp +-muscle_LDADD = $(top_builddir)/libMUSCLE/libMUSCLE-3.7.la ++muscle_LDADD = libMUSCLE-3.7.la + + |