1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- charm-6.10.2/src/arch/common/cc-gcc.sh 2020-08-05 17:58:22.000000000 +0300
+++ charm-6.10.2/src/arch/common/cc-gcc.sh 2020-08-10 12:34:00.190585376 +0300
@@ -1,11 +1,11 @@
-CMK_CPP_CHARM="cpp -P"
-CMK_CPP_C="gcc$CMK_COMPILER_SUFFIX"
-CMK_CC="gcc$CMK_COMPILER_SUFFIX"
-CMK_CXX="g++$CMK_COMPILER_SUFFIX"
-CMK_LD="gcc$CMK_COMPILER_SUFFIX"
-CMK_LDXX="g++$CMK_COMPILER_SUFFIX"
+CMK_CPP_CHARM="cpp-9 -P"
+CMK_CPP_C="gcc-9"
+CMK_CC="gcc-9"
+CMK_CXX="g++-9"
+CMK_LD="gcc-9"
+CMK_LDXX="g++-9"
CMK_CPP_C_FLAGS="-E"
CMK_LD_SHARED='-shared'
CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
--- Make.charm 2020-08-05 20:51:20.000000000 +0300
+++ Make.charm 2020-08-10 12:23:57.005349008 +0300
@@ -1,6 +1,6 @@
# Set CHARMBASE to the top level charm directory.
# The config script will override this setting if there is a directory
# called charm-6.10.2 or charm in the NAMD base directory.
-CHARMBASE = /Projects/namd2/charm-6.10.2
+CHARMBASE = ./charm-6.10.2
--- Makefile 2020-08-05 20:51:20.000000000 +0300
+++ Makefile 2020-08-10 12:23:24.245704240 +0300
@@ -660,11 +660,11 @@
.SECONDARY:
# prevent gmake from deleting intermediate files
$(INCDIR)/%.decl.h $(INCDIR)/%.def.h: $(MKINCDIR) $(SRCDIR)/%.ci
- cpp -E -P $(CIPPFLAGS) $(SRCDIR)/$*.ci > $(INCDIR)/$*.ci
+ cpp-9 -E -P $(CIPPFLAGS) $(SRCDIR)/$*.ci > $(INCDIR)/$*.ci
$(CHARMXI) $(INCDIR)/$*.ci
$(RM) $(INCDIR)/$*.ci
$(MOVE) $*.def.h $(INCDIR)
$(MOVE) $*.decl.h $(INCDIR)
--- arch/Linux-x86_64.tcl 2020-08-05 20:51:20.000000000 +0300
+++ arch/Linux-x86_64.tcl 2020-08-10 12:26:37.080503378 +0300
@@ -1,8 +1,8 @@
#TCLDIR=/Projects/namd2/tcl/tcl8.5.9-linux-x86_64
-TCLDIR=/Projects/namd2/tcl/tcl8.5.9-linux-x86_64-threaded
+TCLDIR=/usr
TCLINCL=-I$(TCLDIR)/include
#TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl
-TCLLIB=-L$(TCLDIR)/lib -ltcl8.5 -ldl -lpthread
+TCLLIB=-L$(TCLDIR)/lib -ltcl8.6 -ldl -lpthread
TCLFLAGS=-DNAMD_TCL
TCL=$(TCLINCL) $(TCLFLAGS)
--- arch/Linux-x86_64.fftw3 2020-08-05 20:51:20.000000000 +0300
+++ arch/Linux-x86_64.fftw3 2020-08-10 12:25:54.367543846 +0300
@@ -1,7 +1,7 @@
-FFTDIR=$(HOME)/fftw3
+FFTDIR=/usr
FFTINCL=-I$(FFTDIR)/include
FFTLIB=-L$(FFTDIR)/lib -lfftw3f
FFTFLAGS=-DNAMD_FFTW -DNAMD_FFTW_3
FFT=$(FFTINCL) $(FFTFLAGS)
--- arch/Linux-x86_64-g++.arch 2020-08-05 20:51:20.000000000 +0300
+++ arch/Linux-x86_64-g++.arch 2020-08-10 12:24:41.554894580 +0300
@@ -1,8 +1,8 @@
NAMD_ARCH = Linux-x86_64
CHARMARCH = multicore-linux-x86_64
-CXX = g++ -m64 -std=c++0x
-CXXOPTS = -O3 -fexpensive-optimizations -ffast-math
-CC = gcc -m64
-COPTS = -O3 -fexpensive-optimizations -ffast-math
+CXX = g++-9 -m64 -std=c++0x
+CXXOPTS = -O3 -fexpensive-optimizations -ffast-math -fPIC
+CC = gcc-9 -m64
+COPTS = -O3 -fexpensive-optimizations -ffast-math -fPIC
|