| 1 |
ottxor 15/03/07 01:18:22 |
| 2 |
|
| 3 |
Added: namd-2.10-gentoo.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C2000586) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-chemistry/namd/files/namd-2.10-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/files/namd-2.10-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/namd/files/namd-2.10-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: namd-2.10-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur NAMD_2.10_Source.orig/arch/Linux-x86_64.fftw NAMD_2.10_Source/arch/Linux-x86_64.fftw |
| 18 |
--- NAMD_2.10_Source.orig/arch/Linux-x86_64.fftw 2015-03-06 17:53:44.170416075 -0700 |
| 19 |
+++ NAMD_2.10_Source/arch/Linux-x86_64.fftw 2015-03-06 17:54:46.641162629 -0700 |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
|
| 22 |
-FFTDIR=/Projects/namd2/fftw/linux-x86_64 |
| 23 |
+FFTDIR=/usr |
| 24 |
FFTINCL=-I$(FFTDIR)/include |
| 25 |
-FFTLIB=-L$(FFTDIR)/lib -lsrfftw -lsfftw |
| 26 |
+FFTLIB=-L$(FFTDIR)/gentoo-libdir -lsrfftw -lsfftw |
| 27 |
FFTFLAGS=-DNAMD_FFTW |
| 28 |
FFT=$(FFTINCL) $(FFTFLAGS) |
| 29 |
|
| 30 |
diff -Naur NAMD_2.10_Source.orig/arch/Linux-x86_64.tcl NAMD_2.10_Source/arch/Linux-x86_64.tcl |
| 31 |
--- NAMD_2.10_Source.orig/arch/Linux-x86_64.tcl 2015-03-06 17:53:44.170416075 -0700 |
| 32 |
+++ NAMD_2.10_Source/arch/Linux-x86_64.tcl 2015-03-06 17:54:46.641162629 -0700 |
| 33 |
@@ -1,9 +1,9 @@ |
| 34 |
|
| 35 |
#TCLDIR=/Projects/namd2/tcl/tcl8.5.9-linux-x86_64 |
| 36 |
-TCLDIR=/Projects/namd2/tcl/tcl8.5.9-linux-x86_64-threaded |
| 37 |
+TCLDIR=/usr |
| 38 |
TCLINCL=-I$(TCLDIR)/include |
| 39 |
#TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl |
| 40 |
-TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl -lpthread |
| 41 |
+TCLLIB=-L$(TCLDIR)/gentoo-libdir -ltcl8.5 -ldl -lpthread |
| 42 |
TCLFLAGS=-DNAMD_TCL |
| 43 |
TCL=$(TCLINCL) $(TCLFLAGS) |
| 44 |
|
| 45 |
diff -Naur NAMD_2.10_Source.orig/Makefile NAMD_2.10_Source/Makefile |
| 46 |
--- NAMD_2.10_Source.orig/Makefile 2015-03-06 17:53:44.170416075 -0700 |
| 47 |
+++ NAMD_2.10_Source/Makefile 2015-03-06 18:01:32.645966590 -0700 |
| 48 |
@@ -389,10 +389,10 @@ |
| 49 |
$(DSTDIR)/stringhash.o |
| 50 |
|
| 51 |
# definitions for Charm routines |
| 52 |
-CHARMC = $(CHARM)/bin/charmc |
| 53 |
-CHARMXI = $(CHARM)/bin/charmc |
| 54 |
-CHARMINC = $(CHARM)/include $(COPTD)CMK_OPTIMIZE=1 |
| 55 |
-CHARMLIB = $(CHARM)/lib |
| 56 |
+CHARMC = /usr/bin/charmc |
| 57 |
+CHARMXI = /usr/bin/charmc |
| 58 |
+CHARMINC = /usr/include/gentoo-charm $(COPTD)CMK_OPTIMIZE=1 |
| 59 |
+CHARMLIB = /usr/gentoo-libdir |
| 60 |
CHARM_MODULES = -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB -module CkMulticast |
| 61 |
#CHARM_MODULES = -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB |
| 62 |
#CHARM_MODULES = -module msa -module NeighborLB -module HybridLB -module RefineLB -module GreedyLB |
| 63 |
@@ -418,7 +418,7 @@ |
| 64 |
|
| 65 |
# Add new executables here. |
| 66 |
|
| 67 |
-BINARIES = namd2 psfgen sortreplicas flipdcd flipbinpdb charmrun |
| 68 |
+BINARIES = namd2 psfgen sortreplicas flipdcd flipbinpdb |
| 69 |
|
| 70 |
# This should be rebuilt at every compile, but not on Win32. |
| 71 |
BUILDINFO = $(DSTDIR)/buildinfo |
| 72 |
@@ -434,7 +434,7 @@ |
| 73 |
|
| 74 |
namd2: $(MKINCDIR) $(MKDSTDIR) $(OBJS) $(LIBS) |
| 75 |
$(MAKEBUILDINFO) |
| 76 |
- $(CHARMC) -verbose -ld++-option \ |
| 77 |
+ $(CHARMC) $(LDFLAGS) -verbose -ld++-option \ |
| 78 |
'$(COPTI)$(CHARMINC) $(COPTI)$(INCDIR) $(COPTI)$(SRCDIR) $(CXXOPTS) $(CXXMICOPTS)' \ |
| 79 |
"$(CHARM_MODULES)" -language charm++ \ |
| 80 |
$(BUILDINFO).o \ |
| 81 |
@@ -484,11 +484,8 @@ |
| 82 |
charmd_faceless.exe: |
| 83 |
$(COPY) $(CHARM)/bin/charmd_faceless.exe charmd_faceless.exe |
| 84 |
|
| 85 |
-charmrun.exe: |
| 86 |
- $(COPY) $(CHARM)/bin/charmrun.exe charmrun.exe |
| 87 |
- |
| 88 |
psfgen: $(MKDSTDIR) $(SBOBJS) $(PLUGINOBJS) |
| 89 |
- $(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
| 90 |
+ $(CC) $(SBCFLAGS) $(LDFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
| 91 |
|
| 92 |
psfgen.exe: $(MKDSTDIR) $(SBOBJS) $(PLUGINOBJS) $(TCLDLL) |
| 93 |
$(CC) $(SBCFLAGS) -o psfgen $(SBOBJS) $(PLUGINOBJS) $(TCLLIB) $(TCLAPPLIB) -lm |
| 94 |
@@ -506,7 +503,7 @@ |
| 95 |
$(CC) $(CFLAGS) -o diffbinpdb $(SRCDIR)/diffbinpdb.c -lm |
| 96 |
|
| 97 |
flipdcd: $(SRCDIR)/flipdcd.c |
| 98 |
- $(CC) $(CFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \ |
| 99 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SRCDIR)/flipdcd.c || \ |
| 100 |
echo "#!/bin/sh\necho unavailable on this platform" > $@; \ |
| 101 |
chmod +x $@ |
| 102 |
|
| 103 |
@@ -516,7 +513,7 @@ |
| 104 |
chmod +x $@ |
| 105 |
|
| 106 |
fixdcd: $(SRCDIR)/fixdcd.c |
| 107 |
- $(CC) $(CFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c |
| 108 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o fixdcd $(SRCDIR)/fixdcd.c |
| 109 |
|
| 110 |
dumpdcd: $(SRCDIR)/dumpdcd.c |
| 111 |
$(CC) $(CFLAGS) -o dumpdcd $(SRCDIR)/dumpdcd.c |
| 112 |
@@ -711,9 +708,7 @@ |
| 113 |
|
| 114 |
DOC_FILES = README.txt announce.txt license.txt notes.txt |
| 115 |
|
| 116 |
-RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb sortreplicas psfgen charmrun namd2 |
| 117 |
- |
| 118 |
-WINDOWS_RELEASE_FILES = $(LIBCUDARTSO) $(WINDOWSBINARIES) $(TCLDLL) |
| 119 |
+RELEASE_FILES = $(LIBCUDARTSO) flipdcd flipbinpdb sortreplicas psfgen namd2 |
| 120 |
|
| 121 |
release: all |
| 122 |
$(ECHO) Creating release $(RELEASE_DIR_NAME) |
| 123 |
@@ -724,17 +719,9 @@ |
| 124 |
for f in `find $(RELEASE_DIR_NAME)/lib -name CVS`; do \ |
| 125 |
/bin/rm -rf $$f; \ |
| 126 |
done |
| 127 |
- if [ -r $(CHARM)/bin/charmd ]; then \ |
| 128 |
- $(COPY) $(CHARM)/bin/charmd $(RELEASE_DIR_NAME); \ |
| 129 |
- fi |
| 130 |
- if [ -r $(CHARM)/bin/charmd_faceless ]; then \ |
| 131 |
- $(COPY) $(CHARM)/bin/charmd_faceless $(RELEASE_DIR_NAME); \ |
| 132 |
- fi |
| 133 |
chmod -R a+rX $(RELEASE_DIR_NAME) |
| 134 |
tar cf $(RELEASE_DIR_NAME).tar $(RELEASE_DIR_NAME) |
| 135 |
gzip $(RELEASE_DIR_NAME).tar |
| 136 |
- echo $(CHARM) |
| 137 |
- ls -l $(CHARM)/lib |
| 138 |
-for f in $(RELEASE_FILES); do echo $$f; $(LDD) $(RELEASE_DIR_NAME)/$$f; done |
| 139 |
|
| 140 |
winrelease: winall |
Archives