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
85
86
87
88
89
90
91
92
93
|
Description: Use system-provided libraries instead of bundled code.
Forbid network access in trying to cover for missing embeds.
Author: Andrius Merkys <merkys@debian.org>
Forwarded: not-needed
--- a/configure
+++ b/configure
@@ -843,7 +843,7 @@
TestReadline() {
cat > testp.cpp <<EOF
#include <cstdio>
-#include <readline.h>
+#include <readline/readline.h>
static char *line_read = (char *)NULL;
// Do not want to actually run this so leave outside main
void Unused() { line_read = readline(""); }
@@ -1087,7 +1087,7 @@
if [ "$PLATFORM" = 'windows' ] ; then
echo "Warning: DTR trajectory not supported on windows."
else
- DIRECTIVES="$DIRECTIVES -DENABLE_DTR"
+ echo "vmdplugin disabled due to nonfree source."
fi
}
--- a/src/ReadLine.cpp
+++ b/src/ReadLine.cpp
@@ -8,8 +8,8 @@
# include <iostream>
#else
# define READLINE_LIBRARY
-# include <readline.h>
-# include <history.h>
+# include <readline/readline.h>
+# include <readline/history.h>
#endif
#include "ReadLine.h"
#include "Command.h"
--- a/src/Makefile
+++ b/src/Makefile
@@ -114,9 +114,9 @@
# Clean/uninstall targets
clean:
$(DEL_FILE) $(OBJECTS) $(FFT_TARGET) cpptraj$(SFX) *.LIBCPPTRAJ.o libcpptraj$(SHARED_SUFFIX)
- cd readline && $(MAKE) clean
+ # cd readline && $(MAKE) clean
cd xdrfile && $(MAKE) clean
- cd arpack && $(MAKE) clean
+ # cd arpack && $(MAKE) clean
cd cuda_kernels && $(MAKE) clean
cd tng && $(MAKE) clean
@@ -136,7 +136,7 @@
uninstall: uninstall_lib uninstall_inc
$(DEL_FILE) $(CPPTRAJBIN)/cpptraj$(SFX)$(EXE)
$(DEL_FILE) $(CPPTRAJLIB)/libcpptraj$(SHARED_SUFFIX)
- cd readline && make uninstall
+ # cd readline && make uninstall
cd xdrfile && make uninstall
cd cuda_kernels && make uninstall
--- a/src/cpptrajdepend
+++ b/src/cpptrajdepend
@@ -401,7 +401,7 @@
Traj_CharmmDcd.o : Traj_CharmmDcd.cpp ArgList.h Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h ByteRoutines.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_CharmmDcd.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
Traj_CharmmRestart.o : Traj_CharmmRestart.cpp Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h BufferedFrame.h BufferedLine.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h StringRoutines.h SymbolExporting.h TextFormat.h Topology.h Traj_CharmmRestart.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
Traj_Conflib.o : Traj_Conflib.cpp Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_Conflib.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
-Traj_DTR.o : Traj_DTR.cpp Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_DTR.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h vmdplugin/dtrplugin.hxx
+Traj_DTR.o : Traj_DTR.cpp Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_DTR.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
Traj_GmxDump.o : Traj_GmxDump.cpp ArgList.h Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_GmxDump.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
Traj_GmxTng.o : Traj_GmxTng.cpp Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_GmxTng.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
Traj_GmxTrX.o : Traj_GmxTrX.cpp ArgList.h Atom.h AtomMask.h AtomType.h BaseIOtype.h Box.h ByteRoutines.h Constants.h CoordinateInfo.h CpptrajFile.h CpptrajStdio.h FileIO.h FileName.h Frame.h FramePtrArray.h MaskToken.h Matrix_3x3.h Molecule.h NameType.h Parallel.h ParameterHolders.h ParameterSet.h ParameterTypes.h Range.h ReplicaDimArray.h Residue.h Segment.h SymbolExporting.h Topology.h Traj_GmxTrX.h TrajectoryIO.h TypeNameHolder.h Unit.h Vec3.h
--- a/src/cpptrajfiles
+++ b/src/cpptrajfiles
@@ -421,7 +421,6 @@
TrajoutList.cpp \
Vec3.cpp \
ViewRst.cpp \
- vmdplugin/dtrplugin.cpp \
xoshiro128plusplus.cpp
CSOURCES= molsurf.c
--- a/get_library.sh
+++ b/get_library.sh
@@ -4,6 +4,9 @@
# Daniel R. Roe
# 2021-03-03
+echo "get_library.sh invoked: not using network during build"
+exit 1
+
WORKDIR=`pwd`
# Attempt to download and install a copy of library
|
