diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-biology/muscle/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-biology/muscle/files')
-rw-r--r-- | sci-biology/muscle/files/3.7-bufferoverflow.patch | 26 | ||||
-rw-r--r-- | sci-biology/muscle/files/3.8.31-make.patch | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/sci-biology/muscle/files/3.7-bufferoverflow.patch b/sci-biology/muscle/files/3.7-bufferoverflow.patch new file mode 100644 index 000000000000..670ad64959cb --- /dev/null +++ b/sci-biology/muscle/files/3.7-bufferoverflow.patch @@ -0,0 +1,26 @@ +diff --git a/globalslinux.cpp b/globalslinux.cpp +index 63baaa1..b1cfcb0 100644 +--- a/globalslinux.cpp ++++ b/globalslinux.cpp +@@ -156,7 +156,7 @@ double GetRAMSizeMB() + } + return DEFAULT_RAM; + } +- int Bytes = atoi(pMem+9)*1000; ++ long Bytes = atol(pMem+9)*1000; + return ((double) Bytes)/1e6; + } + +diff --git a/progress.cpp b/progress.cpp +index a0e91bb..f9b093e 100644 +--- a/progress.cpp ++++ b/progress.cpp +@@ -41,7 +41,7 @@ const char *MemToStr(double MB) + if (MB < 0) + return ""; + +- static char Str[9]; ++ static char Str[16]; + static double MaxMB = 0; + static double RAMMB = 0; + diff --git a/sci-biology/muscle/files/3.8.31-make.patch b/sci-biology/muscle/files/3.8.31-make.patch new file mode 100644 index 000000000000..7c0e7308df54 --- /dev/null +++ b/sci-biology/muscle/files/3.8.31-make.patch @@ -0,0 +1,26 @@ +diff --git a/src/mk b/src/mk +index 475d25a..d4b7e83 100755 +--- a/src/mk ++++ b/src/mk +@@ -5,17 +5,14 @@ ObjNames='aligngivenpath.o aligngivenpathsw.o aligntwomsas.o aligntwoprofs.o aln + rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt + for CPPName in $CPPNames + do +- echo $CPPName >> /dev/tty +- g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt ++ echo "${CXX} ${CXXFLAGS} -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o" ++ ${CXX} ${CXXFLAGS} -c -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o + done + + LINK_OPTS= + if [ `uname -s` == Linux ] ; then + LINK_OPTS=-static + fi +-g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt +-tail muscle.make.stderr.txt + +-strip muscle +-ls -lh muscle +-sum muscle ++echo "${CXX} ${LDFLAGS} -o muscle $ObjNames" ++${CXX} ${LDFLAGS} -o muscle $ObjNames |