| 1 |
jlec 10/02/02 20:38:16 |
| 2 |
|
| 3 |
Added: 6.1.3-ccif-shared.patch 6.1.3-link-proberly.patch |
| 4 |
6.1.3-dont-build-mmdb.patch 6.1.3-glibc2.10.patch |
| 5 |
6.0.2-ppc-double-define-gerror.patch |
| 6 |
6.1.3-dont-make-dirs-in-configure.patch |
| 7 |
Log: |
| 8 |
Splitt out ccp4 libraries -- big thanks to dberkholz starting this project |
| 9 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-ccif-shared.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: 6.1.3-ccif-shared.patch |
| 18 |
=================================================================== |
| 19 |
--- configure 2009-08-04 22:35:34.000000000 +0200 |
| 20 |
+++ configure.new 2009-08-04 22:54:32.000000000 +0200 |
| 21 |
@@ -3136,8 +3136,8 @@ |
| 22 |
fi |
| 23 |
( touch /tmp/$$.cache_file 2>/dev/null && \ |
| 24 |
cat /dev/null > /tmp/$$.cache_file && \ |
| 25 |
- ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file ) || \ |
| 26 |
- ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif |
| 27 |
+ ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --cache-file=/tmp/$$.cache_file --enable-shared-lib ) || \ |
| 28 |
+ ./configure $xopts --libdir=${libdir} --srcdir=${srcdir}/lib/ccif --enable-shared-lib |
| 29 |
rm -f /tmp/$$.cache_file |
| 30 |
if [ "X$LIBFOPTIM" != "X" ]; then |
| 31 |
FOPTIM=$FOPTIM_save |
| 32 |
--- lib/ccif/configure 2009-08-04 22:35:37.000000000 +0200 |
| 33 |
+++ lib/ccif/configure.new 2009-08-04 23:05:44.000000000 +0200 |
| 34 |
@@ -5568,7 +5568,7 @@ |
| 35 |
enable_shared_lib=no |
| 36 |
;; |
| 37 |
|
| 38 |
- i?86-unknown-linux | i?86-pc-linux-gnu ) |
| 39 |
+ i?86-unknown-linux | i?86-pc-linux-gnu | x86_64-unknown-linux-gnu) |
| 40 |
if test $enable_shared_lib = yes ; then |
| 41 |
|
| 42 |
SO_LOC_VAR='LD_LIBRARY_PATH' |
| 43 |
@@ -5585,7 +5585,7 @@ |
| 44 |
else |
| 45 |
SHARED_LIB_PATH='LD_LIBRARY_PATH=`pwd`' |
| 46 |
fi |
| 47 |
- SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME)' |
| 48 |
+ SHARED_LIB_CMD='$(CC) $(SHARED_LIB_FLAGS) -shared -Wl,-soname -Wl,$(SHARED_LIB_NAME) '"$SHARED_LIB_RESTRICT"' ${LOBJS} $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm' |
| 49 |
# SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)' |
| 50 |
SHARED_LIB_EXPORTS_CMD='' |
| 51 |
fi |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-link-proberly.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: 6.1.3-link-proberly.patch |
| 61 |
=================================================================== |
| 62 |
--- lib/src/Makefile.in 2009-03-02 17:53:15.000000000 +0100 |
| 63 |
+++ lib/src/Makefile.in.new 2009-03-02 17:52:09.000000000 +0100 |
| 64 |
@@ -172,9 +172,8 @@ |
| 65 |
|
| 66 |
##### Makefile targets ###### |
| 67 |
|
| 68 |
-all: fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES) |
| 69 |
+all: fsplit $(LMMDB) LMMDB_SO $(LC) LC_SO $(LF) LF_SO $(SCRIPT_MODULES) |
| 70 |
# maybe create shared library |
| 71 |
- $(SHARE_LIB) |
| 72 |
|
| 73 |
$(LC) : $(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) |
| 74 |
$(AR) $(LC) $? |
| 75 |
@@ -186,6 +185,27 @@ |
| 76 |
$(AR) $(LF) $(FINTERFACEOBJS) |
| 77 |
$(RANLIB) $@ |
| 78 |
|
| 79 |
+LMMDB_SO : |
| 80 |
+ $(CC) $(COPTIM) -shared -Wl,-soname,libmmdb.so.0 -o libmmdb.so.0.0.0 \ |
| 81 |
+ $(MMDBOBJS) && \ |
| 82 |
+ ln -sf libmmdb.so.0.0.0 libmmdb.so.0 && \ |
| 83 |
+ ln -sf libmmdb.so.0.0.0 libmmdb.so |
| 84 |
+ |
| 85 |
+LC_SO : |
| 86 |
+ $(CC) $(COPTIM) -shared -Wl,-soname,libccp4c.so.0 -o libccp4c.so.0.0.0 \ |
| 87 |
+ $(CORELIBOBJS) $(CGENERALOBJS) $(CUCOBJS) $(CMTZOBJS) $(CMAPOBJS) $(CSYMOBJS) && \ |
| 88 |
+ ln -sf libccp4c.so.0.0.0 libccp4c.so.0 && \ |
| 89 |
+ ln -sf libccp4c.so.0.0.0 libccp4c.so |
| 90 |
+ |
| 91 |
+LF_SO : |
| 92 |
+ $(FC) $(FOPTIM) -shared -Wl,-soname,libccp4f.so.0 -o libccp4f.so.0.0.0 \ |
| 93 |
+ parser.dir/*.o ccplib.dir/*.o lgglib.dir/*.o plot84lib.dir/*.o \ |
| 94 |
+ libhtml.dir/*.o pxxml.dir/*.o rwbrook.dir/*.o cciflib.dir/*.o \ |
| 95 |
+ harvlib.dir/*.o keyparse.dir/*.o dna_output.dir/*.o plotsubs.dir/*.o \ |
| 96 |
+ modlib.dir/*.o fftlib.dir/*.o unix.dir/*.o pack_f.o pack_c.o $(FINTERFACEOBJS) && \ |
| 97 |
+ ln -sf libccp4f.so.0.0.0 libccp4f.so.0 && \ |
| 98 |
+ ln -sf libccp4f.so.0.0.0 libccp4f.so |
| 99 |
+ |
| 100 |
# cmtz library only |
| 101 |
|
| 102 |
cmtz: $(LCMTZ) |
| 103 |
@@ -339,9 +356,7 @@ |
| 104 |
fi |
| 105 |
cd parser.dir && \ |
| 106 |
for i in `pwd`/*.$F; do \ |
| 107 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 108 |
- && $(AR) ../$(LF) *.o |
| 109 |
- rm -f parser.dir/*.o |
| 110 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 111 |
parser : parser.o |
| 112 |
$(RANLIB) $(LF) |
| 113 |
|
| 114 |
@@ -351,9 +366,7 @@ |
| 115 |
echo ' END' >> ccplib.dir/ccplib.$F |
| 116 |
cd ccplib.dir && $(fsplit_dir)/fsplit $(srcdir)/ccplib.f >/dev/null && $(RMEMPTY) && \ |
| 117 |
for i in `pwd`/*.$F; do \ |
| 118 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 119 |
- && $(AR) ../$(LF) *.o |
| 120 |
- rm -f ccplib.dir/*.o |
| 121 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 122 |
ccplib : ccplib.o |
| 123 |
$(RANLIB) $(LF) |
| 124 |
|
| 125 |
@@ -364,9 +377,7 @@ |
| 126 |
@$(SETFLAGS) ; \ |
| 127 |
cd lgglib.dir && $(fsplit_dir)/fsplit $(srcdir)/lgglib.f >/dev/null && $(RMEMPTY) && \ |
| 128 |
for i in `pwd`/*.$F; do \ |
| 129 |
- eval $(FC) -c $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done\ |
| 130 |
- && $(AR) ../$(LF) *.o |
| 131 |
- rm -f lgglib.dir/*.o |
| 132 |
+ eval $(FC) -c $${lgglib_FLAGS-"$(FFLAGS)"} $(SHARED_LIB_FFLAGS) $$i; done |
| 133 |
lgglib : lgglib.o |
| 134 |
$(RANLIB) $(LF) |
| 135 |
|
| 136 |
@@ -376,9 +387,7 @@ |
| 137 |
echo ' END' >> plot84lib.dir/plot84lib.$F |
| 138 |
cd plot84lib.dir && $(fsplit_dir)/fsplit $(srcdir)/plot84lib.f >/dev/null && $(RMEMPTY) && \ |
| 139 |
for i in `pwd`/*.$F; do \ |
| 140 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 141 |
- && $(AR) ../$(LF) *.o |
| 142 |
- rm -f plot84lib.dir/*.o |
| 143 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 144 |
plot84lib : plot84lib.o |
| 145 |
$(RANLIB) $(LF) |
| 146 |
|
| 147 |
@@ -388,9 +397,7 @@ |
| 148 |
echo ' END' >> libhtml.dir/libhtml.$F |
| 149 |
cd libhtml.dir && $(fsplit_dir)/fsplit $(srcdir)/libhtml.f >/dev/null && $(RMEMPTY) && \ |
| 150 |
for i in `pwd`/*.$F; do \ |
| 151 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 152 |
- && $(AR) ../$(LF) *.o |
| 153 |
- rm -f libhtml.dir/*.o |
| 154 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 155 |
libhtml : libhtml.o |
| 156 |
$(RANLIB) $(LF) |
| 157 |
|
| 158 |
@@ -400,9 +407,7 @@ |
| 159 |
echo ' END' >> pxxml.dir/pxxml.$F |
| 160 |
cd pxxml.dir && $(fsplit_dir)/fsplit $(srcdir)/pxxml.f >/dev/null && $(RMEMPTY) && \ |
| 161 |
for i in `pwd`/*.$F; do \ |
| 162 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 163 |
- && $(AR) ../$(LF) *.o |
| 164 |
- rm -f pxxml.dir/*.o |
| 165 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 166 |
pxxml : pxxml.o |
| 167 |
$(RANLIB) $(LF) |
| 168 |
|
| 169 |
@@ -412,9 +417,7 @@ |
| 170 |
echo ' END' >> rwbrook.dir/rwbrook.$F |
| 171 |
cd rwbrook.dir && $(fsplit_dir)/fsplit $(srcdir)/rwbrook.f >/dev/null && $(RMEMPTY) && \ |
| 172 |
for i in `pwd`/*.$F; do \ |
| 173 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 174 |
- && $(AR) ../$(LF) *.o |
| 175 |
- rm -f rwbrook.dir/*.o |
| 176 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 177 |
rwbrook : rwbrook.o |
| 178 |
$(RANLIB) $(LF) |
| 179 |
|
| 180 |
@@ -424,9 +427,7 @@ |
| 181 |
echo ' END' >> cciflib.dir/cciflib.$F |
| 182 |
cd cciflib.dir && $(fsplit_dir)/fsplit $(srcdir)/cciflib.f >/dev/null && $(RMEMPTY) && \ |
| 183 |
for i in `pwd`/*.$F; do \ |
| 184 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\ |
| 185 |
- && $(AR) ../$(LF) *.o |
| 186 |
- rm -f cciflib.dir/*.o |
| 187 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done |
| 188 |
cciflib : cciflib.o |
| 189 |
$(RANLIB) $(LF) |
| 190 |
|
| 191 |
@@ -440,9 +441,7 @@ |
| 192 |
&& $(AR) ../$(LF) *.o ; else \ |
| 193 |
cd harvlib.dir && $(fsplit_dir)/fsplit $(srcdir)/harv_dummy.f >/dev/null && $(RMEMPTY) && \ |
| 194 |
for i in `pwd`/*.$F; do \ |
| 195 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done\ |
| 196 |
- && $(AR) ../$(LF) *.o ; fi |
| 197 |
- rm -f harvlib.dir/*.o |
| 198 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) -I$(srcdir) $$i; done; fi |
| 199 |
harvlib : harvlib.o |
| 200 |
$(RANLIB) $(LF) |
| 201 |
|
| 202 |
@@ -452,9 +451,7 @@ |
| 203 |
echo ' END' >> keyparse.dir/keyparse.$F |
| 204 |
cd keyparse.dir && $(fsplit_dir)/fsplit $(srcdir)/keyparse.f >/dev/null && $(RMEMPTY) && \ |
| 205 |
for i in `pwd`/*.$F; do \ |
| 206 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 207 |
- && $(AR) ../$(LF) *.o |
| 208 |
- rm -f keyparse.dir/*.o |
| 209 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 210 |
keyparse : keyparse.o |
| 211 |
$(RANLIB) $(LF) |
| 212 |
|
| 213 |
@@ -464,9 +461,7 @@ |
| 214 |
echo ' END' >> dna_output.dir/dna_output.$F |
| 215 |
cd dna_output.dir && $(fsplit_dir)/fsplit $(srcdir)/dna_output.f >/dev/null && $(RMEMPTY) && \ |
| 216 |
for i in `pwd`/*.$F; do \ |
| 217 |
- $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 218 |
- && $(AR) ../$(LF) *.o |
| 219 |
- rm -f dna_output.dir/*.o |
| 220 |
+ $(FC) -I$(srcdir) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 221 |
dna_output : dna_output.o |
| 222 |
$(RANLIB) $(LF) |
| 223 |
|
| 224 |
@@ -474,10 +469,9 @@ |
| 225 |
# for ipdisp. May be useful but could be moved. |
| 226 |
$(LF)(pack_c.o): $(srcdir)/pack_c.c $(srcdir)/pack_c.h |
| 227 |
$(CC) $(CFLAGS) $(SHARED_LIB_CFLAGS) -I$(srcdir) -c $(srcdir)/pack_c.c |
| 228 |
- $(AR) $(LF) pack_c.o && rm pack_c.o |
| 229 |
+ $(AR) $(LF) pack_c.o |
| 230 |
$(LF)(pack_f.o): $(srcdir)/pack_f.f |
| 231 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o \ |
| 232 |
- && rm pack_f.o |
| 233 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $(srcdir)/pack_f.$(F) && $(AR) $(LF) pack_f.o |
| 234 |
pack: $(LF)(pack_c.o) $(LF)(pack_f.o) |
| 235 |
$(RANLIB) $(LF) |
| 236 |
|
| 237 |
@@ -488,9 +482,7 @@ |
| 238 |
echo ' END' >> sorting_main.dir/sorting_main.$F |
| 239 |
cd sorting_main.dir && $(fsplit_dir)/fsplit $(srcdir)/sorting_main.f >/dev/null && $(RMEMPTY) && \ |
| 240 |
for i in `pwd`/*.$F; do \ |
| 241 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 242 |
- && $(AR) ../$(LF) *.o |
| 243 |
- rm -f sorting_main.dir/*.o |
| 244 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 245 |
sorting_main : sorting_main.o |
| 246 |
$(RANLIB) $(LF) |
| 247 |
|
| 248 |
@@ -500,9 +492,7 @@ |
| 249 |
echo ' END' >> plotsubs.dir/plotsubs.$F |
| 250 |
cd plotsubs.dir && $(fsplit_dir)/fsplit $(srcdir)/plotsubs.f >/dev/null && $(RMEMPTY) && \ |
| 251 |
for i in `pwd`/*.$F; do \ |
| 252 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 253 |
- && $(AR) ../$(LF) *.o |
| 254 |
- rm -f plotsubs.dir/*.o |
| 255 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 256 |
plotsubs : plotsubs.o |
| 257 |
$(RANLIB) $(LF) |
| 258 |
|
| 259 |
@@ -512,9 +502,7 @@ |
| 260 |
echo ' END' >> modlib.dir/modlib.$F |
| 261 |
cd modlib.dir && $(fsplit_dir)/fsplit $(srcdir)/modlib.f >/dev/null && $(RMEMPTY) && \ |
| 262 |
for i in `pwd`/*.$F; do \ |
| 263 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 264 |
- && $(AR) ../$(LF) *.o |
| 265 |
- rm -f modlib.dir/*.o |
| 266 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 267 |
modlib : modlib.o |
| 268 |
$(RANLIB) $(LF) |
| 269 |
|
| 270 |
@@ -524,9 +512,7 @@ |
| 271 |
echo ' END' >> fftlib.dir/fftlib.$F |
| 272 |
cd fftlib.dir && $(fsplit_dir)/fsplit $(srcdir)/fftlib.f >/dev/null && $(RMEMPTY) && \ |
| 273 |
for i in `pwd`/*.$F; do \ |
| 274 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done \ |
| 275 |
- && $(AR) ../$(LF) *.o |
| 276 |
- rm -f fftlib.dir/*.o |
| 277 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 278 |
fftlib : fftlib.o |
| 279 |
$(RANLIB) $(LF) |
| 280 |
|
| 281 |
@@ -541,9 +527,7 @@ |
| 282 |
echo ' END' >> unix.dir/unix.f |
| 283 |
cd unix.dir && $(fsplit_dir)/fsplit ../unix.f >/dev/null && $(RMEMPTY) && \ |
| 284 |
for i in `pwd`/*.$F; do \ |
| 285 |
- $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done\ |
| 286 |
- && $(AR) ../$(LF) *.o |
| 287 |
- rm -f unix.dir/*.o |
| 288 |
+ $(FC) -c $(FFLAGS) $(SHARED_LIB_FFLAGS) $$i; done |
| 289 |
unix : unix.o |
| 290 |
$(RANLIB) $(LF) |
| 291 |
|
| 292 |
|
| 293 |
|
| 294 |
|
| 295 |
1.1 sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch |
| 296 |
|
| 297 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch?rev=1.1&view=markup |
| 298 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-build-mmdb.patch?rev=1.1&content-type=text/plain |
| 299 |
|
| 300 |
Index: 6.1.3-dont-build-mmdb.patch |
| 301 |
=================================================================== |
| 302 |
--- lib/src/Makefile.in 2009-06-18 15:44:08.000000000 +0200 |
| 303 |
+++ lib/src/Makefile.in.new 2009-08-11 11:58:25.000000000 +0200 |
| 304 |
@@ -176,7 +176,7 @@ |
| 305 |
|
| 306 |
##### Makefile targets ###### |
| 307 |
|
| 308 |
-all: fsplit $(LMMDB) $(LC) $(LF) $(SCRIPT_MODULES) |
| 309 |
+all: fsplit $(LC) $(LF) $(SCRIPT_MODULES) |
| 310 |
# maybe create shared library |
| 311 |
$(SHARE_LIB) |
| 312 |
|
| 313 |
--- lib/src/Makefile.in 2009-06-18 15:44:08.000000000 +0200 |
| 314 |
+++ lib/src/Makefile.in.new 2009-08-11 12:17:53.000000000 +0200 |
| 315 |
@@ -716,11 +716,9 @@ |
| 316 |
rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ |
| 317 |
done |
| 318 |
|
| 319 |
-install : all install-ccp4HEADERS install-mmdbHEADERS |
| 320 |
- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB) |
| 321 |
+install : all install-ccp4HEADERS |
| 322 |
$(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) |
| 323 |
$(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) |
| 324 |
- $(RANLIB) $(libdir)/$(LMMDB) |
| 325 |
$(RANLIB) $(libdir)/$(LC) |
| 326 |
$(RANLIB) $(libdir)/$(LF) |
| 327 |
$(SHARE_INST) |
| 328 |
|
| 329 |
|
| 330 |
|
| 331 |
1.1 sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch |
| 332 |
|
| 333 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch?rev=1.1&view=markup |
| 334 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-glibc2.10.patch?rev=1.1&content-type=text/plain |
| 335 |
|
| 336 |
Index: 6.1.3-glibc2.10.patch |
| 337 |
=================================================================== |
| 338 |
--- lib/ccif/configure.in 2009-06-10 13:52:59.000000000 +0200 |
| 339 |
+++ lib/ccif/configure.in.new 2009-06-10 14:04:31.000000000 +0200 |
| 340 |
@@ -363,7 +363,7 @@ |
| 341 |
fi |
| 342 |
SHARED_LIB_CMD='$(LD) $(SHARED_LIB_FLAGS) -shared -soname $(SHARED_LIB_NAME) \\\ |
| 343 |
--whole-archive '"$SHARED_LIB_RESTRICT"' $L \\\ |
| 344 |
- $(RX_LFLAG) -o $(SHARED_LIB_NAME)' |
| 345 |
+ $(RX_LFLAG) -o $(SHARED_LIB_NAME) -lm' |
| 346 |
SHARED_LIB_EXPORTS_CMD='cp libccif-universal-ld.lis $(SHARED_LIB_EXPORTS)' |
| 347 |
fi |
| 348 |
;; |
| 349 |
--- lib/ccif/configure 2009-06-10 14:26:58.000000000 +0200 |
| 350 |
+++ lib/ccif/configure.new 2009-06-10 14:43:31.000000000 +0200 |
| 351 |
@@ -1807,7 +1807,7 @@ |
| 352 |
SHARED_LIB_CMD='$(LD) $(SHARED_LIB_CFLAGS) -shared -soname \\\ |
| 353 |
$(SHARED_LIB_NAME) \\\ |
| 354 |
--whole-archive $L \\\ |
| 355 |
- -o $(SHARED_LIB_NAME)' |
| 356 |
+ -o $(SHARED_LIB_NAME) -lm' |
| 357 |
SHARED_LIB_EXPORTS_CMD='' |
| 358 |
fi |
| 359 |
;; |
| 360 |
|
| 361 |
|
| 362 |
|
| 363 |
1.1 sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch |
| 364 |
|
| 365 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch?rev=1.1&view=markup |
| 366 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.0.2-ppc-double-define-gerror.patch?rev=1.1&content-type=text/plain |
| 367 |
|
| 368 |
Index: 6.0.2-ppc-double-define-gerror.patch |
| 369 |
=================================================================== |
| 370 |
--- ccp4-6.0.1.orig/lib/src/library_f.c 2006-06-12 07:06:22.000000000 -0700 |
| 371 |
+++ ccp4-6.0.1/lib/src/library_f.c 2006-06-12 07:21:56.000000000 -0700 |
| 372 |
@@ -716,7 +716,7 @@ |
| 373 |
|
| 374 |
#endif /* end of apple xlf support */ |
| 375 |
|
| 376 |
-#if ( defined (__linux__) && defined (_CALL_SYSV) ) |
| 377 |
+#if ( defined (__linux__) && defined (_CALL_SYSV) && ! defined(G95) && ! defined (GFORTRAN) ) |
| 378 |
/* linuxppc xlf support */ |
| 379 |
void gerror_ (str, Lstr) |
| 380 |
char *str; |
| 381 |
|
| 382 |
|
| 383 |
|
| 384 |
1.1 sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch |
| 385 |
|
| 386 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch?rev=1.1&view=markup |
| 387 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-dont-make-dirs-in-configure.patch?rev=1.1&content-type=text/plain |
| 388 |
|
| 389 |
Index: 6.1.3-dont-make-dirs-in-configure.patch |
| 390 |
=================================================================== |
| 391 |
--- ccp4-6.0.99e.orig/configure 2008-07-31 10:37:22.000000000 -0700 |
| 392 |
+++ ccp4-6.0.99e/configure 2008-07-31 10:39:18.000000000 -0700 |
| 393 |
@@ -643,45 +643,45 @@ |
| 394 |
# echo "! Beware -- the $system installation isn't properly tested." ; } |
| 395 |
syswarn='echo; echo "! Beware -- the $system installation is not properly tested."' |
| 396 |
|
| 397 |
-if test -z "$onlylibs" ; then |
| 398 |
- for i in CCP4_SCR BINSORT_SCR; do |
| 399 |
- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : |
| 400 |
- else |
| 401 |
- eval echo "! No directory \$$i and can\'t create it." |
| 402 |
- echo " Check the value of $i." |
| 403 |
- badvar=1 |
| 404 |
- fi |
| 405 |
- done |
| 406 |
- |
| 407 |
- for i in libdir bindir includedir; do |
| 408 |
- if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : |
| 409 |
- else |
| 410 |
- eval echo "! No directory \$$i and can\'t create it." |
| 411 |
- echo " Check the argument of --$i." |
| 412 |
- badvar=1 |
| 413 |
- fi |
| 414 |
- done |
| 415 |
- |
| 416 |
- for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do |
| 417 |
- if test -d $i || mkdir $i; then : |
| 418 |
- else |
| 419 |
- eval echo "! No directory $i and can\'t create it." |
| 420 |
- badvar=1 |
| 421 |
- fi |
| 422 |
- done |
| 423 |
-else |
| 424 |
- # Kludge to fool the "Makefile" target in the top-level CCP4 |
| 425 |
- # Makefile into not trying to remake src/Makefile.in |
| 426 |
- for i in $srcdir/src $srcdir/lib/src ; do |
| 427 |
- if test -d $i || mkdir $i; then |
| 428 |
- if ! test -f $i/Makefile.in ; then |
| 429 |
- echo |
| 430 |
- echo "onlylibs: making dummy file $i/Makefile.in" |
| 431 |
- touch $i/Makefile.in |
| 432 |
- fi |
| 433 |
- fi |
| 434 |
- done |
| 435 |
-fi |
| 436 |
+#if test -z "$onlylibs" ; then |
| 437 |
+# for i in CCP4_SCR BINSORT_SCR; do |
| 438 |
+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : |
| 439 |
+# else |
| 440 |
+# eval echo "! No directory \$$i and can\'t create it." |
| 441 |
+# echo " Check the value of $i." |
| 442 |
+# badvar=1 |
| 443 |
+# fi |
| 444 |
+# done |
| 445 |
+# |
| 446 |
+# for i in libdir bindir includedir; do |
| 447 |
+# if ( eval test -d \$$i || eval mkdir -p \$$i ) ; then : |
| 448 |
+# else |
| 449 |
+# eval echo "! No directory \$$i and can\'t create it." |
| 450 |
+# echo " Check the argument of --$i." |
| 451 |
+# badvar=1 |
| 452 |
+# fi |
| 453 |
+# done |
| 454 |
+# |
| 455 |
+# for i in $dotsrc $dotunsupp $dotunsuppsrc $dotdeprec $dotdeprecsrc ./lib ./lib/src ./lib/data ./ccp4i/etc/unix $mosflmdir/lib $mosflmdir/bin $mosflmdir/cbf/lib ; do |
| 456 |
+# if test -d $i || mkdir $i; then : |
| 457 |
+# else |
| 458 |
+# eval echo "! No directory $i and can\'t create it." |
| 459 |
+# badvar=1 |
| 460 |
+# fi |
| 461 |
+# done |
| 462 |
+#else |
| 463 |
+# # Kludge to fool the "Makefile" target in the top-level CCP4 |
| 464 |
+# # Makefile into not trying to remake src/Makefile.in |
| 465 |
+# for i in $srcdir/src $srcdir/lib/src ; do |
| 466 |
+# if test -d $i || mkdir $i; then |
| 467 |
+# if ! test -f $i/Makefile.in ; then |
| 468 |
+# echo |
| 469 |
+# echo "onlylibs: making dummy file $i/Makefile.in" |
| 470 |
+# touch $i/Makefile.in |
| 471 |
+# fi |
| 472 |
+# fi |
| 473 |
+# done |
| 474 |
+#fi |
| 475 |
|
| 476 |
### sanity checks |
Archives