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