1 |
jlec 10/09/27 15:09:53 |
2 |
|
3 |
Added: 5.6.0084-allow-dynamic-linking.patch |
4 |
Log: |
5 |
Version Bump |
6 |
|
7 |
(Portage version: 2.2_rc87/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/refmac/files/5.6.0084-allow-dynamic-linking.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/files/5.6.0084-allow-dynamic-linking.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/files/5.6.0084-allow-dynamic-linking.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 5.6.0084-allow-dynamic-linking.patch |
16 |
=================================================================== |
17 |
diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1 |
18 |
index 5263df1..62ccd3b 100644 |
19 |
--- a/makefile_refmac.inc1 |
20 |
+++ b/makefile_refmac.inc1 |
21 |
@@ -90,9 +90,7 @@ messy_pdb.o \ |
22 |
bridge.o \ |
23 |
i0.o \ |
24 |
i1.o \ |
25 |
-chbevl.o \ |
26 |
-$(LLIBCIF) \ |
27 |
-$(LLIBLAPACK) |
28 |
+chbevl.o |
29 |
|
30 |
|
31 |
SUBL = \ |
32 |
@@ -126,9 +124,7 @@ cell_symm_subrs.o \ |
33 |
iheap_sort.o \ |
34 |
linalgebra.o \ |
35 |
math_refmac.o \ |
36 |
-subnumrec.o \ |
37 |
-$(LLIBLAPACK) \ |
38 |
-$(LLIBCCP) |
39 |
+subnumrec.o |
40 |
|
41 |
#-------------------------------------------------------------------------------- |
42 |
|
43 |
@@ -154,32 +150,32 @@ twin77mod.o: twin77mod.f |
44 |
$(FC) $(FFLAGS) -c twin77mod.f |
45 |
|
46 |
|
47 |
-max_with_twins.o: restr_files.f90 max_with_twins.f |
48 |
- $(FC) $(FFLAGS) -c restr_files.f90 max_with_twins.f |
49 |
+max_with_twins.o: restr_files.o max_with_twins.f |
50 |
+ $(FC) $(FFLAGS) -c max_with_twins.f |
51 |
|
52 |
-merohedr_twin.o: restr_files.f90 merohedr_twin.f |
53 |
- $(FC) $(FFLAGS) -c restr_files.f90 merohedr_twin.f |
54 |
+merohedr_twin.o: restr_files.o merohedr_twin.f |
55 |
+ $(FC) $(FFLAGS) -c merohedr_twin.f |
56 |
|
57 |
-ls_scaling_twin_save.o: restr_files.f90 ls_scaling_twin_save.f |
58 |
- $(FC) $(FFLAGS) -c restr_files.f90 ls_scaling_twin_save.f |
59 |
+ls_scaling_twin_save.o: restr_files.o ls_scaling_twin_save.f |
60 |
+ $(FC) $(FFLAGS) -c ls_scaling_twin_save.f |
61 |
|
62 |
-ml_params_refine.o: restr_files.f90 ml_params_refine.f |
63 |
- $(FC) $(FFLAGS) -c restr_files.f90 ml_params_refine.f |
64 |
+ml_params_refine.o: restr_files.o ml_params_refine.f |
65 |
+ $(FC) $(FFLAGS) -c ml_params_refine.f |
66 |
|
67 |
optimise_solvent_all.o: optimise_solvent_all.f90 |
68 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 |
69 |
|
70 |
-ncs_rest.o: restr_files.f90 ncs_ncs_generate.f90 ncs_rest.f |
71 |
- $(FC) $(FFLAGS) -c restr_files.f90 ncs_ncs_generate.f90 ncs_rest.f |
72 |
+ncs_rest.o: restr_files.o ncs_ncs_generate.o ncs_rest.f |
73 |
+ $(FC) $(FFLAGS) -c ncs_rest.f |
74 |
|
75 |
-ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.f90 |
76 |
- $(FC) $(FFLAGS) -c ncs_ncs_generate.f90 align_refmac.f90 |
77 |
+ncs_ncs_generate.o: ncs_ncs_generate.f90 align_refmac.o |
78 |
+ $(FC) $(FFLAGS) -c ncs_ncs_generate.f90 |
79 |
|
80 |
-lsq_exp2.o: restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f |
81 |
- $(FC) $(FFLAGS) -c restr_files.f90 dist_routines.f90 ncs_simil.f90 ridge.f90 local_tls.f90 lsq_exp2.f |
82 |
+lsq_exp2.o: restr_files.o dist_routines.o ncs_simil.o ridge.o local_tls.o lsq_exp2.f |
83 |
+ $(FC) $(FFLAGS) -c lsq_exp2.f |
84 |
|
85 |
-vdw_and_contacts.o: vdw_and_contacts.f local_tls.f90 ridge.f90 restr_files.f90 |
86 |
- $(FC) $(FFLAGS) -c restr_files.f90 ridge.f90 local_tls.f90 vdw_and_contacts.f |
87 |
+vdw_and_contacts.o: vdw_and_contacts.f local_tls.o ridge.o restr_files.o |
88 |
+ $(FC) $(FFLAGS) -c vdw_and_contacts.f |
89 |
|
90 |
dist_routines.o: dist_routines.f90 |
91 |
$(FC) $(FFLAGS) -c dist_routines.f90 |
92 |
@@ -193,77 +189,77 @@ ridge.o: ridge.f90 |
93 |
align_refmac.o: align_refmac.f90 |
94 |
$(FC) $(FFLAGS) -c align_refmac.f90 |
95 |
|
96 |
-rigid_allocate.o: restr_files.f90 rigid_allocate.f |
97 |
- $(FC) $(FFLAGS) -c restr_files.f90 rigid_allocate.f |
98 |
+rigid_allocate.o: restr_files.o rigid_allocate.f |
99 |
+ $(FC) $(FFLAGS) -c rigid_allocate.f |
100 |
|
101 |
-tls_allocate.o: restr_files.f90 tls_allocate.f |
102 |
- $(FC) $(FFLAGS) -c restr_files.f90 tls_allocate.f |
103 |
+tls_allocate.o: restr_files.o tls_allocate.f |
104 |
+ $(FC) $(FFLAGS) -c tls_allocate.f |
105 |
|
106 |
-hkon_secder_tch.o: hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 restr_files.f90 |
107 |
- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 hkon_secder_tch.f |
108 |
+hkon_secder_tch.o: hkon_secder_tch.f local_tls.o ncs_simil.o optimise_solvent_all.o restr_files.o |
109 |
+ $(FC) $(FFLAGS) -c hkon_secder_tch.f |
110 |
|
111 |
-oppro_allocate.o: oppro_allocate.f filter_params.f90 optimise_solvent_all.f90 restr_files.f90 |
112 |
- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 filter_params.f90 oppro_allocate.f |
113 |
+oppro_allocate.o: oppro_allocate.f filter_params.o optimise_solvent_all.o restr_files.o |
114 |
+ $(FC) $(FFLAGS) -c oppro_allocate.f |
115 |
|
116 |
-read_extra_restraints.o: restr_files.f90 read_extra_restraints.f |
117 |
- $(FC) $(FFLAGS) -c restr_files.f90 read_extra_restraints.f |
118 |
+read_extra_restraints.o: restr_files.o read_extra_restraints.f |
119 |
+ $(FC) $(FFLAGS) -c read_extra_restraints.f |
120 |
|
121 |
coords.o: coords.f90 atomf77mod.f |
122 |
$(FC) $(FFLAGS) -c atomf77mod.f coords.f90 |
123 |
|
124 |
-refpre_twin.o: refpre_twin.f coords.f90 automorphism.f90 restr_files.f90 |
125 |
- $(FC) $(FFLAGS) -c restr_files.f90 coords.f90 automorphism.f90 refpre_twin.f |
126 |
+refpre_twin.o: refpre_twin.f coords.o automorphism.o restr_files.o |
127 |
+ $(FC) $(FFLAGS) -c refpre_twin.f |
128 |
|
129 |
-decide_twin_opers_0.o: restr_files.f90 decide_twin_opers_0.f |
130 |
- $(FC) $(FFLAGS) -c restr_files.f90 decide_twin_opers_0.f |
131 |
+decide_twin_opers_0.o: restr_files.o decide_twin_opers_0.f |
132 |
+ $(FC) $(FFLAGS) -c decide_twin_opers_0.f |
133 |
|
134 |
automorphism.o: automorphism.f90 |
135 |
$(FC) $(FFLAGS) -c automorphism.f90 |
136 |
|
137 |
-mtz_write_twin.o: mtz_write_twin.f filter_params.f90 restr_files.f90 |
138 |
- $(FC) $(FFLAGS) -c restr_files.f90 filter_params.f90 mtz_write_twin.f |
139 |
+mtz_write_twin.o: mtz_write_twin.f filter_params.o restr_files.o |
140 |
+ $(FC) $(FFLAGS) -c mtz_write_twin.f |
141 |
|
142 |
filter_params.o: filter_params.f90 |
143 |
$(FC) $(FFLAGS) -c filter_params.f90 |
144 |
|
145 |
-rcard_tor1.o: rcard_tor1.f filter_params.f90 local_tls.f90 ridge.f90 optimise_solvent_all.f90 restr_files.f90 |
146 |
- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 filter_params.f90 local_tls.f90 ridge.f90 rcard_tor1.f |
147 |
+rcard_tor1.o: rcard_tor1.f filter_params.o local_tls.o ridge.o optimise_solvent_all.o restr_files.o |
148 |
+ $(FC) $(FFLAGS) -c rcard_tor1.f |
149 |
|
150 |
-inout_routines.o: restr_files.f90 inout_routines.f |
151 |
- $(FC) $(FFLAGS) -c restr_files.f90 inout_routines.f |
152 |
+inout_routines.o: restr_files.o inout_routines.f |
153 |
+ $(FC) $(FFLAGS) -c inout_routines.f |
154 |
|
155 |
-local_tls.o: local_tls.f90 linalgebra_f90.f90 |
156 |
- $(FC) $(FFLAGS) -c linalgebra_f90.f90 local_tls.f90 |
157 |
+local_tls.o: local_tls.f90 linalgebra_f90.o |
158 |
+ $(FC) $(FFLAGS) -c local_tls.f90 |
159 |
|
160 |
linalgebra_f90.o: linalgebra_f90.f90 |
161 |
$(FC) $(FFLAGS) -c linalgebra_f90.f90 |
162 |
|
163 |
-make_refmac_dummy.o: make_refmac_dummy.f optimise_solvent_all.f90 |
164 |
- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 make_refmac_dummy.f |
165 |
+make_refmac_dummy.o: make_refmac_dummy.f optimise_solvent_all.o |
166 |
+ $(FC) $(FFLAGS) -c make_refmac_dummy.f |
167 |
|
168 |
-ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.f90 |
169 |
- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 ml_scaling_double.f |
170 |
+ml_scaling_double.o: ml_scaling_double.f optimise_solvent_all.o |
171 |
+ $(FC) $(FFLAGS) -c ml_scaling_double.f |
172 |
|
173 |
-refall_twin.o: refall_twin.f optimise_solvent_all.f90 restr_files.f90 |
174 |
- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 refall_twin.f |
175 |
+refall_twin.o: refall_twin.f optimise_solvent_all.o restr_files.o |
176 |
+ $(FC) $(FFLAGS) -c refall_twin.f |
177 |
|
178 |
-rharvest.o: rharvest.f optimise_solvent_all.f90 |
179 |
- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 rharvest.f |
180 |
+rharvest.o: rharvest.f optimise_solvent_all.o |
181 |
+ $(FC) $(FFLAGS) -c rharvest.f |
182 |
|
183 |
-solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 |
184 |
- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 solvent_contr_mask.f |
185 |
+solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.o |
186 |
+ $(FC) $(FFLAGS) -c solvent_contr_mask.f |
187 |
|
188 |
-subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 restr_files.f90 |
189 |
- $(FC) $(FFLAGS) -c restr_files.f90 optimise_solvent_all.f90 subag_scale_hessian.f |
190 |
+subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.o restr_files.o |
191 |
+ $(FC) $(FFLAGS) -c subag_scale_hessian.f |
192 |
|
193 |
-subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90 |
194 |
- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 subcf_scale1.f |
195 |
+subcf_scale1.o: subcf_scale1.f optimise_solvent_all.o |
196 |
+ $(FC) $(FFLAGS) -c subcf_scale1.f |
197 |
|
198 |
-bvalue_routines.o: bvalue_routines.f90 restr_files.f90 atomf77mod.f |
199 |
- $(FC) $(FFLAGS) -c restr_files.f90 atomf77mod.f bvalue_routines.f90 |
200 |
+bvalue_routines.o: bvalue_routines.f90 restr_files.o atomf77mod.f |
201 |
+ $(FC) $(FFLAGS) -c bvalue_routines.f90 |
202 |
|
203 |
-refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 restr_files.f90 bvalue_routines.f90 |
204 |
- $(FC) $(FFLAGS) -c bvalue_routines.f90 restr_files.f90 optimise_solvent_all.f90 refmac_xml.f |
205 |
+refmac_xml.o: refmac_xml.f optimise_solvent_all.o restr_files.o bvalue_routines.o |
206 |
+ $(FC) $(FFLAGS) -c refmac_xml.f |
207 |
|
208 |
hkl_pack.o: hkl_pack.f90 |
209 |
$(FC) $(FFLAGS) -c hkl_pack.f90 |
210 |
@@ -272,30 +268,31 @@ subvag.o: subvag.f hkl_pack.f90 |
211 |
$(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f |
212 |
|
213 |
refmac: $(SUBR) |
214 |
- $(FC) $(FFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) |
215 |
+ $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) |
216 |
|
217 |
-mol2_file.o: mol2_file.f odb_files.f90 |
218 |
- $(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f |
219 |
+mol2_file.o: mol2_file.f odb_files.o |
220 |
+ $(FC) $(FFLAGS) -c mol2_file.f |
221 |
|
222 |
-odb_files.o: odb_files.f90 elements_module.f90 enerf77mod.f |
223 |
- $(FC) $(FFLAGS) -c elements_module.f90 enerf77mod.f odb_files.f90 |
224 |
+odb_files.o: odb_files.f90 elements_module.o enerf77mod.f |
225 |
+ $(FC) $(FFLAGS) -c enerf77mod.f odb_files.f90 |
226 |
|
227 |
elements_module.o: elements_module.f90 |
228 |
$(FC) $(FFLAGS) -c elements_module.f90 |
229 |
|
230 |
-make_lib2.o: make_lib2.f odb_files.f90 |
231 |
- $(FC) $(FFLAGS) -c odb_files.f90 make_lib2.f |
232 |
+make_lib2.o: make_lib2.f odb_files.o |
233 |
+ $(FC) $(FFLAGS) -c make_lib2.f |
234 |
|
235 |
pdb2libcheck.o: pdb2libcheck.f90 |
236 |
$(FC) $(FFLAGS) -c pdb2libcheck.f90 |
237 |
|
238 |
-libcheck.o: libcheck.f elements_module.f90 pdb2libcheck.f90 |
239 |
- $(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f |
240 |
+libcheck.o: libcheck.f elements_module.o pdb2libcheck.o |
241 |
+ $(FC) $(FFLAGS) -c libcheck.f |
242 |
|
243 |
libcheck: $(SUBL) |
244 |
- $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL) |
245 |
+ $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) |
246 |
|
247 |
clean: |
248 |
/bin/rm *.o |
249 |
|
250 |
bridge.o: bridge.cpp llhood.h covmat.h Gauss.h tabfunc.h |
251 |
+ $(CXX) $(CXXFLAGS) -c bridge.cpp |