[SCM] LAMMPS Molecular Dynamics Simulator branch, master, updated. upstream/20120221.git18e3637-13-g791f61b

[Anton Gladky]

The following commit has been merged in the master branch:
commit 791f61b9f189d1b7eb150337267a3fe2de5dda65
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Feb 25 20:21:48 2012 +0100

    Add a g++ patch.

diff --git a/debian/patches/fix_g++_build.patch b/debian/patches/fix_g++_build.patch
new file mode 100644
index 0000000..fa82b8d
--- /dev/null
+++ b/debian/patches/fix_g++_build.patch
@@ -0,0 +1,63 @@
+--- a/src/MAKE/Makefile.g++
++++ b/src/MAKE/Makefile.g++
+@@ -7,13 +7,13 @@
+ # specify flags and libraries needed for your compiler
+ 
+ CC =		g++
+-CCFLAGS =	-g -O # -Wunused
++CCFLAGS =	-Wall $(shell dpkg-buildflags --get CXXFLAGS)
+ DEPFLAGS =	-M
+-LINK =		g++
+-LINKFLAGS =	-g -O
+-LIB =           
++LINK =		mpic++
++LINKFLAGS =	$(shell dpkg-buildflags --get LDFLAGS)
++LIB =           -lstdc++
+ ARCHIVE =	ar
+-ARFLAGS =	-rc
++ARFLAGS =	-rcsv
+ SIZE =		size
+ 
+ # ---------------------------------------------------------------------
+@@ -24,7 +24,7 @@
+ # LAMMPS ifdef settings, OPTIONAL
+ # see possible settings in doc/Section_start.html#2_2 (step 4)
+ 
+-LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_JPEG
++LMP_INC =	-DLAMMPS_GZIP
+ 
+ # MPI library, REQUIRED
+ # see discussion in doc/Section_start.html#2_2 (step 5)
+@@ -33,9 +33,9 @@
+ # PATH = path for MPI library
+ # LIB = name of MPI library
+ 
+-MPI_INC =       -DMPICH_SKIP_MPICXX
++MPI_INC =       -I/usr/include/mpi -DOMPI_SKIP_MPICXX -DMPICH_SKIP_MPICXX 
+ MPI_PATH = 
+-MPI_LIB =	-lmpich -lmpl -lpthread
++MPI_LIB =	
+ 
+ # FFT library, OPTIONAL
+ # see discussion in doc/Section_start.html#2_2 (step 6)
+@@ -44,9 +44,9 @@
+ # PATH = path for FFT library
+ # LIB = name of FFT library
+ 
+-FFT_INC =    	-DFFT_FFTW
++FFT_INC =    	-DFFT_FFTW3
+ FFT_PATH = 
+-FFT_LIB =	-lfftw
++FFT_LIB =	-lfftw3
+ 
+ # JPEG library, OPTIONAL
+ # see discussion in doc/Section_start.html#2_2 (step 7)
+@@ -57,7 +57,7 @@
+ 
+ JPG_INC =       
+ JPG_PATH = 	
+-JPG_LIB =	-ljpeg
++JPG_LIB =	
+ 
+ # ---------------------------------------------------------------------
+ # build rules and dependencies
diff --git a/debian/patches/series b/debian/patches/series
index 8acf0f0..dae13b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 set_configure_flags.patch
 fix_format_not_a_string.patch
+fix_g++_build.patch

-- 
LAMMPS Molecular Dynamics Simulator