summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Gardner <je_fro@gentoo.org>2007-08-24 18:53:44 +0000
committerJeffrey Gardner <je_fro@gentoo.org>2007-08-24 18:53:44 +0000
commit1ebd2d8cdc501afb3050fa729ac366ab125512fd (patch)
treee90287b4b33df8dce5074a8047453887ee4a1f69 /sci-chemistry/namd/files
parentDepend on no specific charm revision. (diff)
downloadje_fro-1ebd2d8cdc501afb3050fa729ac366ab125512fd.tar.gz
je_fro-1ebd2d8cdc501afb3050fa729ac366ab125512fd.tar.bz2
je_fro-1ebd2d8cdc501afb3050fa729ac366ab125512fd.zip
Quick and dirty namd for amd64 only.
svn path=/; revision=59
Diffstat (limited to 'sci-chemistry/namd/files')
-rw-r--r--sci-chemistry/namd/files/namd-2.6-gentoo-amd64.patch (renamed from sci-chemistry/namd/files/namd-2.6-gentoo.patch)40
1 files changed, 19 insertions, 21 deletions
diff --git a/sci-chemistry/namd/files/namd-2.6-gentoo.patch b/sci-chemistry/namd/files/namd-2.6-gentoo-amd64.patch
index 9a71de8..9d65e51 100644
--- a/sci-chemistry/namd/files/namd-2.6-gentoo.patch
+++ b/sci-chemistry/namd/files/namd-2.6-gentoo-amd64.patch
@@ -1,6 +1,6 @@
-diff -Naur NAMD_2.6_Source/Makefile NAMD_2.6_Source.new/Makefile
---- NAMD_2.6_Source/Makefile 2006-08-30 00:19:25.000000000 -0400
-+++ NAMD_2.6_Source.new/Makefile 2006-09-19 15:56:17.000000000 -0400
+diff -aurN NAMD_2.6_Source-orig/Makefile NAMD_2.6_Source/Makefile
+--- NAMD_2.6_Source-orig/Makefile 2007-08-24 13:35:35.659265380 -0500
++++ NAMD_2.6_Source/Makefile 2007-08-24 13:42:09.933733803 -0500
@@ -232,10 +232,10 @@
$(DSTDIR)/stringhash.o
@@ -11,8 +11,8 @@ diff -Naur NAMD_2.6_Source/Makefile NAMD_2.6_Source.new/Makefile
-CHARMLIB = $(CHARM)/lib
+CHARMC = /usr/bin/charmc
+CHARMXI = /usr/bin/charmc
-+CHARMINC = /usr/include/charm-5.9 $(COPTD)CMK_OPTIMIZE=1
-+CHARMLIB = /usr/lib
++CHARMINC = /usr/include/charm-9999 $(COPTD)CMK_OPTIMIZE=1
++CHARMLIB = /usr/lib64
# Libraries we may have changed
LIBS = $(PLUGINLIB) $(DPMTALIBS) $(DPMELIBS) $(TCLDLL)
@@ -76,32 +76,30 @@ diff -Naur NAMD_2.6_Source/Makefile NAMD_2.6_Source.new/Makefile
-for f in $(RELEASE_FILES); do echo $$f; $(LDD) $$f; done
winrelease: winall
-diff -Naur NAMD_2.6_Source/arch/Linux-i686.fftw NAMD_2.6_Source.new/arch/Linux-i686.fftw
---- NAMD_2.6_Source/arch/Linux-i686.fftw 2004-02-20 17:38:36.000000000 -0500
-+++ NAMD_2.6_Source.new/arch/Linux-i686.fftw 2006-09-19 15:52:32.000000000 -0400
-@@ -1,7 +1,7 @@
+diff -aurN NAMD_2.6_Source-orig/arch/Linux-amd64.fftw NAMD_2.6_Source/arch/Linux-amd64.fftw
+--- NAMD_2.6_Source-orig/arch/Linux-amd64.fftw 2007-08-24 13:35:35.663265610 -0500
++++ NAMD_2.6_Source/arch/Linux-amd64.fftw 2007-08-24 13:43:45.623186828 -0500
+@@ -1,7 +1,6 @@
--FFTDIR=/Projects/namd2/fftw/linux
+-FFTDIR=/Projects/namd2/fftw/linux-amd64
-FFTINCL=-I$(FFTDIR)/include -I$(HOME)/fftw/include
-FFTLIB=-L$(FFTDIR)/lib -L$(HOME)/fftw/lib -lsrfftw -lsfftw
-+#FFTDIR=/Projects/namd2/fftw/linux
+FFTINCL=-I/usr/include
-+FFTLIB=-L/usr/lib -lsrfftw -lsfftw
++FFTLIB=-L/usr/lib64 -lsrfftw -lsfftw
FFTFLAGS=-DNAMD_FFTW
FFT=$(FFTINCL) $(FFTFLAGS)
-diff -Naur NAMD_2.6_Source/arch/Linux-i686.tcl NAMD_2.6_Source.new/arch/Linux-i686.tcl
---- NAMD_2.6_Source/arch/Linux-i686.tcl 2004-10-27 17:40:55.000000000 -0400
-+++ NAMD_2.6_Source.new/arch/Linux-i686.tcl 2006-09-19 15:56:45.000000000 -0400
-@@ -1,8 +1,8 @@
+diff -aurN NAMD_2.6_Source-orig/arch/Linux-amd64.tcl NAMD_2.6_Source/arch/Linux-amd64.tcl
+--- NAMD_2.6_Source-orig/arch/Linux-amd64.tcl 2007-08-24 13:35:35.663265610 -0500
++++ NAMD_2.6_Source/arch/Linux-amd64.tcl 2007-08-24 13:46:44.921404457 -0500
+@@ -1,7 +1,6 @@
--TCLDIR=/Projects/namd2/tcl/linux
-+#TCLDIR=/Projects/namd2/tcl/linux
- #TCLDIR=$(HOME)/tcl/cray-xt3
+-TCLDIR=/Projects/namd2/tcl/linux-amd64
-TCLINCL=-I$(TCLDIR)/include -I$(HOME)/tcl/include
-TCLLIB=-L$(TCLDIR)/lib -L$(HOME)/tcl/lib -ltcl8.3 -ldl
+-TCLFLAGS=-DNAMD_TCL
+TCLINCL=-I/usr/include
-+TCLLIB=-L/usr/lib -L$(HOME)/tcl/lib -ltcl -ldl
- TCLFLAGS=-DNAMD_TCL -DUSE_NON_CONST
++TCLLIB=-L/usr/lib64 -L$(HOME)/tcl/lib -ltcl -ldl
++TCLFLAGS=-DNAMD_TCL -DUSE_NON_CONST
TCL=$(TCLINCL) $(TCLFLAGS)