Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/refmac/files: 5.5-test.log.patch 5.5-allow-dynamic-linking.patch
Date: Tue, 02 Feb 2010 22:43:59
Message-Id: E1NcRTP-0000DJ-Un@stork.gentoo.org
1 jlec 10/02/02 22:43:55
2
3 Added: 5.5-test.log.patch 5.5-allow-dynamic-linking.patch
4 Log:
5 refmac splitted from ccp4 package
6 (Portage version: 2.2_rc62/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-chemistry/refmac/files/5.5-test.log.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/refmac/files/5.5-test.log.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/refmac/files/5.5-test.log.patch?rev=1.1&content-type=text/plain
13
14 Index: 5.5-test.log.patch
15 ===================================================================
16 --- test-framework/refmac5/test_refmac5.py 2009-06-29 15:45:37.000000000 +0200
17 +++ test-framework/refmac5/test_refmac5.py.new 2009-06-29 15:48:05.000000000 +0200
18 @@ -88,7 +88,8 @@
19 'make hydr no',
20 'labin IP=IMEAN SIGIP=SIGIMEAN FREE=FreeR_flag',
21 'labout FC=FC PHIC=PHIC'],
22 - working_directory = self.test_dir)
23 + working_directory = self.test_dir,
24 + log_file = 'test_twinned_refinement.log')
25
26 self.assertEqual(status, 0)
27
28 @@ -123,7 +124,8 @@
29 'weight auto',
30 'ncyc 20',
31 'labout FC=FC PHIC=PHIC'],
32 - working_directory = self.test_dir)
33 + working_directory = self.test_dir,
34 + log_file = 'test_4_domain_tls.log')
35
36 self.assertEqual(status, 0)
37
38 @@ -156,7 +158,8 @@
39 'anomalous form SE -9.9 3.9',
40 'anomalous wavelength 0.97966',
41 'labout FC=FC PHIC=PHIC'],
42 - working_directory = self.test_dir)
43 + working_directory = self.test_dir,
44 + log_file = 'test_sad_refinement.log')
45
46 self.assertEqual(status, 0)
47
48
49
50
51 1.1 sci-chemistry/refmac/files/5.5-allow-dynamic-linking.patch
52
53 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/refmac/files/5.5-allow-dynamic-linking.patch?rev=1.1&view=markup
54 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/refmac/files/5.5-allow-dynamic-linking.patch?rev=1.1&content-type=text/plain
55
56 Index: 5.5-allow-dynamic-linking.patch
57 ===================================================================
58 --- makefile_refmac.inc1.orig 2008-08-01 22:17:14.000000000 -0700
59 +++ makefile_refmac.inc1 2008-08-01 22:18:46.000000000 -0700
60 @@ -69,9 +69,7 @@
61 bridge.o \
62 i0.o \
63 i1.o \
64 -chbevl.o \
65 -$(LLIBCIF) \
66 -$(LLIBLAPACK)
67 +chbevl.o
68 #$(LLIBCCP) \
69 #crt0.o \
70
71 @@ -95,8 +93,7 @@
72 emin.o \
73 libcheck_min.o \
74 mol2_file.o \
75 -sdf_files.o \
76 -$(LLIBCCP)
77 +sdf_files.o
78
79 SUBM = \
80 main_makecif.o \
81 @@ -116,9 +113,7 @@
82 make_PDB.o \
83 makecif.o \
84 make_unix_ccp4.o \
85 -make_vdw.o \
86 -$(LLIBCCP) \
87 -$(LLIBCIF)
88 +make_vdw.o
89
90 SUBT = \
91 tlsgroups.o \
92 @@ -142,9 +137,7 @@
93 inout_routines.o \
94 errwrt_1.o \
95 linalgebra.o \
96 -subnumrec.o \
97 -$(LLIBCCP) \
98 -$(LLIBCIF)
99 +subnumrec.o
100 #--------------------------------------------------------------------------------
101
102 ed = echo 'g/^CMDW-5.0/s// /@w@q@' | tr "@" "\012" | ed -s
103 @@ -154,16 +147,16 @@
104 all: refmac libcheck makecif
105
106 refmac: $(SUBR)
107 - $(FC) $(FFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP)
108 + $(FC) $(FFLAGS) $(LDFLAGS) -o refmac${VERSION} ${SUBR} $(LLIBOTHERS) $(LLIBCCP) $(LLIBCIF) $(LLIBLAPACK)
109
110 libcheck: $(SUBL)
111 - $(FC) $(FFLAGS) -o libcheck${VERSION} $(SUBL)
112 + $(FC) $(FFLAGS) $(LDFLAGS) -o libcheck${VERSION} $(SUBL) $(LLIBCCP)
113
114 makecif: $(SUBM)
115 - $(FC) $(FFLAGS) -o makecif${VERSION} $(SUBM)
116 + $(FC) $(FFLAGS) $(LDFLAGS) -o makecif${VERSION} $(SUBM) $(LLIBCCP) $(LLIBCIF)
117
118 tlsgroups: $(SUBT)
119 - $(FC) $(FFLAGS) -o tlsgroups${VERSION} $(SUBT)
120 + $(FC) $(FFLAGS) $(LDFLAGS) -o tlsgroups${VERSION} $(SUBT) $(LLIBCCP) $(LLIBCIF)
121
122 clean:
123 /bin/rm *.o