| 1 |
jlec 10/07/27 18:47:33 |
| 2 |
|
| 3 |
Modified: vmd-1.8.7-gentoo.patch |
| 4 |
Added: vmd-1.8.7-respect-flags.patch |
| 5 |
Removed: vmd-1.8.6-python-2.5.patch |
| 6 |
vmd-1.8.6-config-gentoo.patch |
| 7 |
vmd-1.8.7-use-bash-startup.patch |
| 8 |
vmd-1.8.6-tcltk8.5.patch |
| 9 |
vmd-1.8.6-fix-crash-on-tcl8.5.patch |
| 10 |
vmd-1.8.5-config-gentoo.patch |
| 11 |
vmd-1.8.7-config.patch |
| 12 |
Log: |
| 13 |
Make it really prefix ready, don't mix CFLAGS/CXXFLAGS,clean old patches |
| 14 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 15 |
|
| 16 |
Revision Changes Path |
| 17 |
1.2 sci-chemistry/vmd/files/vmd-1.8.7-gentoo.patch |
| 18 |
|
| 19 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/files/vmd-1.8.7-gentoo.patch?rev=1.2&view=markup |
| 20 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/files/vmd-1.8.7-gentoo.patch?rev=1.2&content-type=text/plain |
| 21 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/files/vmd-1.8.7-gentoo.patch?r1=1.1&r2=1.2 |
| 22 |
|
| 23 |
Index: vmd-1.8.7-gentoo.patch |
| 24 |
=================================================================== |
| 25 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/files/vmd-1.8.7-gentoo.patch,v |
| 26 |
retrieving revision 1.1 |
| 27 |
retrieving revision 1.2 |
| 28 |
diff -u -r1.1 -r1.2 |
| 29 |
--- vmd-1.8.7-gentoo.patch 18 May 2010 07:22:51 -0000 1.1 |
| 30 |
+++ vmd-1.8.7-gentoo.patch 27 Jul 2010 18:47:33 -0000 1.2 |
| 31 |
@@ -40,7 +40,7 @@ |
| 32 |
+++ b/plugins/Makefile.rej |
| 33 |
@@ -3,7 +3,6 @@ |
| 34 |
# Makefile for molecule file readers |
| 35 |
- # $Id: vmd-1.8.7-gentoo.patch,v 1.1 2010/05/18 07:22:51 jlec Exp $ |
| 36 |
+ # $Id: vmd-1.8.7-gentoo.patch,v 1.2 2010/07/27 18:47:33 jlec Exp $ |
| 37 |
|
| 38 |
-- .SILENT: |
| 39 |
|
| 40 |
@@ -48,7 +48,7 @@ |
| 41 |
|
| 42 |
@@ -17,7 +16,6 @@ |
| 43 |
# Makefile for molecule file readers |
| 44 |
- # $Id: vmd-1.8.7-gentoo.patch,v 1.1 2010/05/18 07:22:51 jlec Exp $ |
| 45 |
+ # $Id: vmd-1.8.7-gentoo.patch,v 1.2 2010/07/27 18:47:33 jlec Exp $ |
| 46 |
|
| 47 |
-+ .SILENT: |
| 48 |
|
| 49 |
@@ -543,19 +543,30 @@ |
| 50 |
VMFILES = molefacture.tcl molefacture_builder.tcl \ |
| 51 |
molefacture_edit.tcl molefacture_geometry.tcl molefacture_gui.tcl \ |
| 52 |
diff --git a/plugins/molfile_plugin/Makefile b/plugins/molfile_plugin/Makefile |
| 53 |
-index 18fb6dc..f17bdda 100644 |
| 54 |
+index 18fb6dc..e32b130 100644 |
| 55 |
--- a/plugins/molfile_plugin/Makefile |
| 56 |
+++ b/plugins/molfile_plugin/Makefile |
| 57 |
@@ -1,7 +1,6 @@ |
| 58 |
# Makefile for molecule file readers |
| 59 |
- # $Id: vmd-1.8.7-gentoo.patch,v 1.1 2010/05/18 07:22:51 jlec Exp $ |
| 60 |
+ # $Id: vmd-1.8.7-gentoo.patch,v 1.2 2010/07/27 18:47:33 jlec Exp $ |
| 61 |
|
| 62 |
-.SILENT: |
| 63 |
|
| 64 |
.SUFFIXES: |
| 65 |
|
| 66 |
+@@ -14,8 +13,8 @@ INCDIR = -I../include -I${SRCDIR} |
| 67 |
+ |
| 68 |
+ VPATH = src ../include ${ARCHDIR} |
| 69 |
+ |
| 70 |
+-SCCFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 71 |
+-SCXXFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 72 |
++SCCFLAGS = $(CFLAGS) $(DEF)"STATIC_PLUGIN" |
| 73 |
++SCXXFLAGS = $(CXXFLAGS) $(DEF)"STATIC_PLUGIN" |
| 74 |
+ |
| 75 |
+ # |
| 76 |
+ # Rules |
| 77 |
diff --git a/plugins/molfile_plugin/src/cifplugin/Makefile b/plugins/molfile_plugin/src/cifplugin/Makefile |
| 78 |
-index 1dfa768..88f4b7b 100644 |
| 79 |
+index 1dfa768..e3f380b 100644 |
| 80 |
--- a/plugins/molfile_plugin/src/cifplugin/Makefile |
| 81 |
+++ b/plugins/molfile_plugin/src/cifplugin/Makefile |
| 82 |
@@ -1,6 +1,5 @@ |
| 83 |
@@ -565,6 +576,15 @@ |
| 84 |
|
| 85 |
.SUFFIXES: |
| 86 |
|
| 87 |
+@@ -14,7 +13,7 @@ INCDIR = -I../include -I${SRCDIR} |
| 88 |
+ VPATH = src ../include ${ARCHDIR} |
| 89 |
+ |
| 90 |
+ SCCFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 91 |
+-SCXXFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 92 |
++SCXXFLAGS = $(CXXFLAGS) $(DEF)"STATIC_PLUGIN" |
| 93 |
+ |
| 94 |
+ # |
| 95 |
+ # Rules |
| 96 |
diff --git a/plugins/moltoptools/Makefile b/plugins/moltoptools/Makefile |
| 97 |
index 3599cb7..8d80ec2 100644 |
| 98 |
--- a/plugins/moltoptools/Makefile |
| 99 |
@@ -1018,7 +1038,7 @@ |
| 100 |
VMFILES = zoomseq.tcl pkgIndex.tcl |
| 101 |
VMVERSION = 1.1 |
| 102 |
diff --git a/vmd-1.8.7/configure b/vmd-1.8.7/configure |
| 103 |
-index f01944a..2763347 100755 |
| 104 |
+index f01944a..b04bade 100755 |
| 105 |
--- a/vmd-1.8.7/configure |
| 106 |
+++ b/vmd-1.8.7/configure |
| 107 |
@@ -13,10 +13,10 @@ |
| 108 |
@@ -1170,6 +1190,22 @@ |
| 109 |
|
| 110 |
if ($config_static) { |
| 111 |
# link everything statically (this won't work due to libGL issues) |
| 112 |
+@@ -2714,11 +2691,11 @@ LIBDIRS = $LIBDIRS |
| 113 |
+ DEFINES = $DEFINES |
| 114 |
+ |
| 115 |
+ # compiler and compiler directives |
| 116 |
+-CC = $arch_cc |
| 117 |
+-CFLAGS = $arch_copts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) $rpm_optflags |
| 118 |
++CC = gentoo-gcc |
| 119 |
++CFLAGS = gentoo-cflags -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) $rpm_optflags |
| 120 |
+ |
| 121 |
+-CCPP = $arch_ccpp |
| 122 |
+-CPPFLAGS = $arch_opt_flag $arch_cppopts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) $rpm_optflags |
| 123 |
++CCPP = gentoo-g++ |
| 124 |
++CPPFLAGS = gentoo-cxxflags $arch_cppopts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) $rpm_optflags |
| 125 |
+ |
| 126 |
+ NVCC = $arch_nvcc |
| 127 |
+ NVCCFLAGS = $arch_nvccflags -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) |
| 128 |
@@ -2766,7 +2743,7 @@ $config_progname: y.tab.h \$(VMD_OBJS) |
| 129 |
if [ ! -r ./$arch_template_repository ]; then \\ |
| 130 |
ln -s $vmd_src_dir/$arch_template_repository ./$arch_template_repository ; \\ |
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.1 sci-chemistry/vmd/files/vmd-1.8.7-respect-flags.patch |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/files/vmd-1.8.7-respect-flags.patch?rev=1.1&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/vmd/files/vmd-1.8.7-respect-flags.patch?rev=1.1&content-type=text/plain |
| 138 |
|
| 139 |
Index: vmd-1.8.7-respect-flags.patch |
| 140 |
=================================================================== |
| 141 |
diff --git a/plugins/molfile_plugin/Makefile b/plugins/molfile_plugin/Makefile |
| 142 |
index 18fb6dc..8659573 100644 |
| 143 |
--- a/plugins/molfile_plugin/Makefile |
| 144 |
+++ b/plugins/molfile_plugin/Makefile |
| 145 |
@@ -14,8 +14,8 @@ INCDIR = -I../include -I${SRCDIR} |
| 146 |
|
| 147 |
VPATH = src ../include ${ARCHDIR} |
| 148 |
|
| 149 |
-SCCFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 150 |
-SCXXFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 151 |
+SCCFLAGS = $(CFLAGS) $(DEF)"STATIC_PLUGIN" |
| 152 |
+SCXXFLAGS = $(CXXFLAGS) $(DEF)"STATIC_PLUGIN" |
| 153 |
|
| 154 |
# |
| 155 |
# Rules |
| 156 |
diff --git a/plugins/molfile_plugin/src/cifplugin/Makefile b/plugins/molfile_plugin/src/cifplugin/Makefile |
| 157 |
index 1dfa768..9de3f6b 100644 |
| 158 |
--- a/plugins/molfile_plugin/src/cifplugin/Makefile |
| 159 |
+++ b/plugins/molfile_plugin/src/cifplugin/Makefile |
| 160 |
@@ -14,7 +14,7 @@ INCDIR = -I../include -I${SRCDIR} |
| 161 |
VPATH = src ../include ${ARCHDIR} |
| 162 |
|
| 163 |
SCCFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 164 |
-SCXXFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN" |
| 165 |
+SCXXFLAGS = $(CXXFLAGS) $(DEF)"STATIC_PLUGIN" |
| 166 |
|
| 167 |
# |
| 168 |
# Rules |
Archives