1 |
jlec 10/06/28 04:48:15 |
2 |
|
3 |
Added: 5.6.0078-allow-dynamic-linking.patch |
4 |
Log: |
5 |
Version Bump |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/refmac/files/5.6.0078-allow-dynamic-linking.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: 5.6.0078-allow-dynamic-linking.patch |
15 |
=================================================================== |
16 |
diff --git a/makefile_refmac.inc1 b/makefile_refmac.inc1 |
17 |
index 3f858c8..8b32cab 100644 |
18 |
--- a/makefile_refmac.inc1 |
19 |
+++ b/makefile_refmac.inc1 |
20 |
@@ -89,9 +89,7 @@ messy_pdb.o \ |
21 |
bridge.o \ |
22 |
i0.o \ |
23 |
i1.o \ |
24 |
-chbevl.o \ |
25 |
-$(LLIBCIF) \ |
26 |
-$(LLIBLAPACK) |
27 |
+chbevl.o |
28 |
|
29 |
|
30 |
SUBL = \ |
31 |
@@ -124,9 +122,7 @@ cell_symm_subrs.o \ |
32 |
iheap_sort.o \ |
33 |
linalgebra.o \ |
34 |
math_refmac.o \ |
35 |
-subnumrec.o \ |
36 |
-$(LLIBLAPACK) \ |
37 |
-$(LLIBCCP) |
38 |
+subnumrec.o |
39 |
|
40 |
#-------------------------------------------------------------------------------- |
41 |
|
42 |
@@ -150,7 +146,7 @@ twin77mod.o: twin77mod.f |
43 |
$(FC) $(FFLAGS) -c twin77mod.f |
44 |
|
45 |
|
46 |
-optimise_solvent_all.o: optimise_solvent_all.f90 |
47 |
+optimise_solvent_all.o: optimise_solvent_all.f90 atomf77mod.o |
48 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 |
49 |
|
50 |
ncs_rest.o: ncs_ncs_generate.f90 ncs_rest.f |
51 |
@@ -178,7 +174,7 @@ align_refmac.o: align_refmac.f90 |
52 |
$(FC) $(FFLAGS) -c align_refmac.f90 |
53 |
|
54 |
|
55 |
-hkon_secder_tch.o: hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 |
56 |
+hkon_secder_tch.o: hkon_secder_tch.f local_tls.f90 ncs_simil.f90 optimise_solvent_all.f90 optimise_solvent_all.o |
57 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 ncs_simil.f90 local_tls.f90 hkon_secder_tch.f |
58 |
|
59 |
oppro_allocate.o: oppro_allocate.f filter_params.f90 optimise_solvent_all.f90 |
60 |
@@ -220,8 +216,8 @@ refall_twin.o: refall_twin.f optimise_solvent_all.f90 |
61 |
rharvest.o: rharvest.f optimise_solvent_all.f90 |
62 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 rharvest.f |
63 |
|
64 |
-solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 |
65 |
- $(FC) $(FFLAGS) -c optimise_solvent_all.f90 solvent_contr_mask.f |
66 |
+solvent_contr_mask.o: solvent_contr_mask.f optimise_solvent_all.f90 atomf77mod.o |
67 |
+ $(FC) $(FFLAGS) -c atomf77mod.f optimise_solvent_all.f90 solvent_contr_mask.f |
68 |
|
69 |
subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 |
70 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 subag_scale_hessian.f |
71 |
@@ -229,7 +225,7 @@ subag_scale_hessian.o: subag_scale_hessian.f optimise_solvent_all.f90 |
72 |
subcf_scale1.o: subcf_scale1.f optimise_solvent_all.f90 |
73 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 subcf_scale1.f |
74 |
|
75 |
-refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 |
76 |
+refmac_xml.o: refmac_xml.f optimise_solvent_all.f90 optimise_solvent_all.o |
77 |
$(FC) $(FFLAGS) -c optimise_solvent_all.f90 refmac_xml.f |
78 |
|
79 |
hkl_pack.o: hkl_pack.f90 |
80 |
@@ -239,7 +235,7 @@ subvag.o: subvag.f hkl_pack.f90 |
81 |
$(FC) $(FFLAGS) -c hkl_pack.f90 subvag.f |
82 |
|
83 |
refmac: $(SUBR) |
84 |
- $(FC) $(FFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) |
85 |
+ $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) |
86 |
|
87 |
mol2_file.o: mol2_file.f odb_files.f90 |
88 |
$(FC) $(FFLAGS) -c odb_files.f90 mol2_file.f |
89 |
@@ -260,7 +256,7 @@ libcheck.o: libcheck.f elements_module.f90 pdb2libcheck.f90 |
90 |
$(FC) $(FFLAGS) -c elements_module.f90 pdb2libcheck.f90 libcheck.f |
91 |
|
92 |
libcheck: $(SUBL) |
93 |
- $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL) |
94 |
+ $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK) |
95 |
|
96 |
clean: |
97 |
/bin/rm *.o |