diff options
Diffstat (limited to 'sci-chemistry/mead/files')
| -rw-r--r-- | sci-chemistry/mead/files/mead-2.2.7-gcc43.patch | 22 | ||||
| -rw-r--r-- | sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch | 57 |
2 files changed, 79 insertions, 0 deletions
diff --git a/sci-chemistry/mead/files/mead-2.2.7-gcc43.patch b/sci-chemistry/mead/files/mead-2.2.7-gcc43.patch new file mode 100644 index 000000000000..673f25890e74 --- /dev/null +++ b/sci-chemistry/mead/files/mead-2.2.7-gcc43.patch @@ -0,0 +1,22 @@ +--- mead-2.2.7.orig/libmead/AtomSet.h ++++ mead-2.2.7/libmead/AtomSet.h +@@ -31,8 +31,7 @@ + + #include <map> + #include <list> +-#include <string> +-using std::string; ++#include <string.h> + #include "MEAD/Atom.h" + #include "MEAD/Coord.h" + #include "MEAD/AtomID.h" +--- mead-2.2.7.orig/libmead/DielCubeRep.h ++++ mead-2.2.7/libmead/DielCubeRep.h +@@ -31,6 +31,7 @@ + + #include "MEAD/CubeLatSpec.h" + #include "MEAD/globals.h" ++#include <string.h> + + class DielCubeRep { + public: diff --git a/sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch b/sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch new file mode 100644 index 000000000000..61c54737778e --- /dev/null +++ b/sci-chemistry/mead/files/mead-2.2.7-respect-cflags.patch @@ -0,0 +1,57 @@ +diff -Naur mead-2.2.7-orig/apps/libmso/Makefile.in mead-2.2.7/apps/libmso/Makefile.in +--- mead-2.2.7-orig/apps/libmso/Makefile.in 2004-12-10 14:33:49.000000000 -0600 ++++ mead-2.2.7/apps/libmso/Makefile.in 2009-02-15 16:32:40.000000000 -0600 +@@ -35,8 +35,8 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + + ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) +-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) +-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) ++ALL_CXXFLAGS = @CXXFLAGS@ ++ALL_CFLAGS = @CFLAGS@ + + .SUFFIXES: + .SUFFIXES: .cc .o +diff -Naur mead-2.2.7-orig/apps/Makefile.common.in mead-2.2.7/apps/Makefile.common.in +--- mead-2.2.7-orig/apps/Makefile.common.in 2004-11-19 16:49:56.000000000 -0600 ++++ mead-2.2.7/apps/Makefile.common.in 2009-02-15 16:32:22.000000000 -0600 +@@ -36,10 +36,10 @@ + LIBS = @LIBS@ -lm + + ALL_CPPFLAGS = -I. $(LOCALINCS) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) +-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) +-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) ++ALL_CXXFLAGS = @CXXFLAGS@ ++ALL_CFLAGS = @CFLAGS@ + +-CXXLINK = $(CXX) $(ALL_CPPFLAGS) $(CXX_DEBUGFLAGS) $(CXX_OPTFLAGS) \ ++CXXLINK = $(CXX) $(ALL_CPPFLAGS) @CXXFLAGS@ \ + $(LDFLAGS) + + .SUFFIXES: .cc .o +diff -Naur mead-2.2.7-orig/libmead/Makefile.in mead-2.2.7/libmead/Makefile.in +--- mead-2.2.7-orig/libmead/Makefile.in 2008-03-04 14:18:22.000000000 -0600 ++++ mead-2.2.7/libmead/Makefile.in 2009-02-15 16:31:56.000000000 -0600 +@@ -99,8 +99,8 @@ + INCLUDES = -I$(top_srcdir) + + ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) $(REGEX_CPP) $(CXX_DEFS) +-ALL_CXXFLAGS = $(CXX_OPTFLAGS) $(CXX_DEBUGFLAGS) $(CXX_SHAREDFLAGS) +-ALL_CFLAGS = $(CC_DEBUGFLAGS) $(CC_OPTFLAGS) ++ALL_CXXFLAGS = @CXXFLAGS@ ++ALL_CFLAGS = @CFLAGS@ + + + +diff -Naur mead-2.2.7-orig/swig/Makefile.in mead-2.2.7/swig/Makefile.in +--- mead-2.2.7-orig/swig/Makefile.in 2007-11-27 15:57:17.000000000 -0600 ++++ mead-2.2.7/swig/Makefile.in 2009-02-15 16:34:35.000000000 -0600 +@@ -58,7 +58,7 @@ + CXX_FLAGS = @CXX_NOOPTFLAGS@ @CXX_DEBUGFLAGS@ @CXX_SHAREDFLAGS@ + CXX_DYNLIB_FLAGS = @CXX_DYNLIB_FLAGS@ + +-ALL_CXXFLAGS = $(CPP_FLAGS) $(CXX_FLAGS) ++ALL_CXXFLAGS = $(CPP_FLAGS) @CXXFLAGS@ @CXX_SHAREDFLAGS@ + + MEADINC = -I$(top_srcdir) -I$(srcdir) + MEADLIBS = -L../libmead -lmead |