| 1 |
commit: 8a94314afa021c97253ad9574b2658127eb58032 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 27 09:31:39 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 27 10:08:56 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a94314a |
| 7 |
|
| 8 |
sci-libs/cbflib: Clean old |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.25 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-libs/cbflib/Manifest | 4 - |
| 14 |
sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild | 65 ------- |
| 15 |
sci-libs/cbflib/cbflib-0.9.2.10.ebuild | 64 ------ |
| 16 |
sci-libs/cbflib/cbflib-0.9.2.2.ebuild | 71 ------- |
| 17 |
sci-libs/cbflib/files/0.9.0-Makefile.patch | 104 ---------- |
| 18 |
sci-libs/cbflib/files/0.9.0-python.patch | 16 -- |
| 19 |
sci-libs/cbflib/files/0.9.2.10-Makefile.patch | 269 -------------------------- |
| 20 |
sci-libs/cbflib/files/0.9.2.2-Makefile.patch | 150 -------------- |
| 21 |
8 files changed, 743 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest |
| 24 |
index 51d7624..cc5c869 100644 |
| 25 |
--- a/sci-libs/cbflib/Manifest |
| 26 |
+++ b/sci-libs/cbflib/Manifest |
| 27 |
@@ -1,6 +1,2 @@ |
| 28 |
-DIST CBFlib-0.9.2.10.tar.gz 4898574 SHA256 e98ed35e0659ca4ebc10cb035399e8a94f30c721be734ac2bac1933ae6a1bc6f SHA512 d0d9fa6f990f3fb03733887088f409bb348462ba4e8fa0a5431ae1c1087c54e8de969790f04d90e8f23e3eaf351f3253e3ae8791058b47a6cd230b04d9c51898 WHIRLPOOL d380f5144bd497fe4635c9a78579cab58c8fe6bfc14552eabd8da27d94654af1b0be024daff1cf4dbd769291e9011a708dbbab1c9e81c35e5eeb2588a3cca17a |
| 29 |
-DIST CBFlib-0.9.2.2.tar.gz 4549837 SHA256 ce289756d643aa2ab79fd1614183ccee7ad06f128d1d8d59c97d7c107ce5f802 SHA512 756153ba81c17ea55d1397227273bc912a4fec7fd70d0b226b2519a5a14c92b612d6421f2748583aea5d0162b1defa51740200e936ce4f23b13b1506cfa5a043 WHIRLPOOL 4b690fa5698503eb424886391752fa2f4b5dad89b184cb4390506980032141ac5c147002b0261ec2769c9ea8aba696c629883b080bc504bc58d973367e399718 |
| 30 |
DIST CBFlib-0.9.2.4.tar.gz 4564355 SHA256 c7d11a70e6454a6801e8f30d56db6639fa814aa25775bf54109325073c4a08c1 SHA512 e1ee1fe39b3d15e5d707d973c5666f198e3c9006b4c449fa56287032661a7ecfbeadad0fda528310f9cdd9f33856004333784a840d193a5c7db6c5c071fb07e5 WHIRLPOOL ded867cda1757196ad2188eda7a1a09999411a3d1a452172880fabdc5504aa346e44b2c8c25d921f674897ec7f8edf3da4de79d4843f68ecbb72634631ea43dd |
| 31 |
DIST CBFlib-0.9.3.3.tar.gz 5787633 SHA256 d6c3cc2c6c0aed2a3aa7c74dc645ad223470dc76bb2181242534d4c322bb00dc SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff WHIRLPOOL 8e9e0004cdd2411c9d37b588afa274e1c2b955fe361fc3df597acc30526958d5722993f36f33672769ef55eca51b87917f57ec56528a7711a934d9f8de2b8019 |
| 32 |
-DIST CBFlib_0.9.2_Data_Files_Input.tar.gz 17102003 SHA256 4414166a5a5b5ef6e4c460bb6941bd0aca53e7a41dbc9e5bdf0c6d44cf00d5ac SHA512 86689695155b822146e8cc1e310f4820292cde28c9cc240da34ef8259c429af7b182a055e1014078081528c505b0269367cd5e6e80278a53b448f0cc0dfcc3aa WHIRLPOOL a946dce8a6fa1a90a6fb3e7ec167a2ba41fdd5ef9435f4da083f9f9a7f5dfb94a2ebef1d1c36f5332fc486452b9b26c29161c7484ba337da83c24fbcd0334126 |
| 33 |
-DIST CBFlib_0.9.2_Data_Files_Output.tar.gz 36009958 SHA256 311cebff470b7d4f94b7888252cca879e6e0745f4e2eb6fa9e21cf84f984029b SHA512 fb08cbc5a68a73089c012c4c8da2a02ed7a216e02f23f2b24ba2e4dca7af834c7200868028921540e14326ea88e48028675e1be1f2c572eb3e962a79cf892002 WHIRLPOOL 386691e706dafacb9f5ee13f74fcf0f78c3a827d434ae18602fb2a8f805c178f9883e10658ed739a35bb7ceb58b628c1a9f1bbf89144efd793d13c7a62c3d05b |
| 34 |
|
| 35 |
diff --git a/sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild b/sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild |
| 36 |
deleted file mode 100644 |
| 37 |
index 165e632..0000000 |
| 38 |
--- a/sci-libs/cbflib/cbflib-0.9.2.10-r1.ebuild |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,65 +0,0 @@ |
| 41 |
-# Copyright 1999-2013 Gentoo Foundation |
| 42 |
-# Distributed under the terms of the GNU General Public License v2 |
| 43 |
-# $Id$ |
| 44 |
- |
| 45 |
-EAPI=5 |
| 46 |
- |
| 47 |
-inherit eutils flag-o-matic fortran-2 toolchain-funcs |
| 48 |
- |
| 49 |
-MY_P1="CBFlib-${PV}" |
| 50 |
-#MY_P2="CBFlib_${PV}" |
| 51 |
-MY_P2="CBFlib_0.9.3" |
| 52 |
- |
| 53 |
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files" |
| 54 |
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" |
| 55 |
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/" |
| 56 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz" |
| 57 |
-# test? ( |
| 58 |
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz |
| 59 |
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz |
| 60 |
-# )" |
| 61 |
- |
| 62 |
-LICENSE="GPL-2" |
| 63 |
-SLOT="0" |
| 64 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 65 |
-IUSE="doc test" |
| 66 |
- |
| 67 |
-S=${WORKDIR}/${MY_P1} |
| 68 |
- |
| 69 |
-RDEPEND="sci-libs/hdf5:=" |
| 70 |
-DEPEND="${RDEPEND}" |
| 71 |
- |
| 72 |
-RESTRICT="test" |
| 73 |
- |
| 74 |
-src_prepare(){ |
| 75 |
- rm -rf Py* drel* dRel* ply* |
| 76 |
- epatch "${FILESDIR}"/${PV}-Makefile.patch |
| 77 |
- cp Makefile_LINUX_gcc42 Makefile |
| 78 |
- |
| 79 |
- append-fflags -fno-range-check |
| 80 |
- append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG |
| 81 |
- |
| 82 |
- sed \ |
| 83 |
- -e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \ |
| 84 |
- -i Makefile || die |
| 85 |
- tc-export CC CXX AR RANLIB |
| 86 |
-} |
| 87 |
- |
| 88 |
-src_compile() { |
| 89 |
- emake -j1 shared |
| 90 |
-} |
| 91 |
- |
| 92 |
-src_test(){ |
| 93 |
- emake -j1 basic |
| 94 |
-} |
| 95 |
- |
| 96 |
-src_install() { |
| 97 |
- insinto /usr/include/${PN} |
| 98 |
- dosym ${PN} /usr/include/cbf |
| 99 |
- doins include/*.h |
| 100 |
- |
| 101 |
- dolib.so solib/lib* |
| 102 |
- |
| 103 |
- dodoc README |
| 104 |
- use doc && dohtml -r README.html html_graphics doc |
| 105 |
-} |
| 106 |
|
| 107 |
diff --git a/sci-libs/cbflib/cbflib-0.9.2.10.ebuild b/sci-libs/cbflib/cbflib-0.9.2.10.ebuild |
| 108 |
deleted file mode 100644 |
| 109 |
index c84f493..0000000 |
| 110 |
--- a/sci-libs/cbflib/cbflib-0.9.2.10.ebuild |
| 111 |
+++ /dev/null |
| 112 |
@@ -1,64 +0,0 @@ |
| 113 |
-# Copyright 1999-2013 Gentoo Foundation |
| 114 |
-# Distributed under the terms of the GNU General Public License v2 |
| 115 |
-# $Id$ |
| 116 |
- |
| 117 |
-EAPI=5 |
| 118 |
- |
| 119 |
-inherit eutils flag-o-matic fortran-2 toolchain-funcs |
| 120 |
- |
| 121 |
-MY_P1="CBFlib-${PV}" |
| 122 |
-#MY_P2="CBFlib_${PV}" |
| 123 |
-MY_P2="CBFlib_0.9.3" |
| 124 |
- |
| 125 |
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files" |
| 126 |
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" |
| 127 |
-BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/" |
| 128 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz" |
| 129 |
-# test? ( |
| 130 |
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz |
| 131 |
-# mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz |
| 132 |
-# )" |
| 133 |
- |
| 134 |
-LICENSE="GPL-2" |
| 135 |
-SLOT="0" |
| 136 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 137 |
-IUSE="doc test" |
| 138 |
- |
| 139 |
-S=${WORKDIR}/${MY_P1} |
| 140 |
- |
| 141 |
-RDEPEND="sci-libs/hdf5:=" |
| 142 |
-DEPEND="${RDEPEND}" |
| 143 |
- |
| 144 |
-RESTRICT="test" |
| 145 |
- |
| 146 |
-src_prepare(){ |
| 147 |
- rm -rf Py* drel* dRel* ply* |
| 148 |
- epatch "${FILESDIR}"/${PV}-Makefile.patch |
| 149 |
- cp Makefile_LINUX_gcc42 Makefile |
| 150 |
- |
| 151 |
- append-fflags -fno-range-check |
| 152 |
- append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG |
| 153 |
- |
| 154 |
- sed \ |
| 155 |
- -e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \ |
| 156 |
- -i Makefile || die |
| 157 |
- tc-export CC CXX AR RANLIB |
| 158 |
-} |
| 159 |
- |
| 160 |
-src_compile() { |
| 161 |
- emake -j1 shared |
| 162 |
-} |
| 163 |
- |
| 164 |
-src_test(){ |
| 165 |
- emake -j1 basic |
| 166 |
-} |
| 167 |
- |
| 168 |
-src_install() { |
| 169 |
- insinto /usr/include/${PN} |
| 170 |
- doins include/*.h |
| 171 |
- |
| 172 |
- dolib.so solib/lib* |
| 173 |
- |
| 174 |
- dodoc README |
| 175 |
- use doc && dohtml -r README.html html_graphics doc |
| 176 |
-} |
| 177 |
|
| 178 |
diff --git a/sci-libs/cbflib/cbflib-0.9.2.2.ebuild b/sci-libs/cbflib/cbflib-0.9.2.2.ebuild |
| 179 |
deleted file mode 100644 |
| 180 |
index fe47e54..0000000 |
| 181 |
--- a/sci-libs/cbflib/cbflib-0.9.2.2.ebuild |
| 182 |
+++ /dev/null |
| 183 |
@@ -1,71 +0,0 @@ |
| 184 |
-# Copyright 1999-2012 Gentoo Foundation |
| 185 |
-# Distributed under the terms of the GNU General Public License v2 |
| 186 |
-# $Id$ |
| 187 |
- |
| 188 |
-EAPI=4 |
| 189 |
- |
| 190 |
-inherit eutils flag-o-matic fortran-2 toolchain-funcs |
| 191 |
- |
| 192 |
-MY_P1="CBFlib-${PV}" |
| 193 |
-#MY_P2="CBFlib_${PV}" |
| 194 |
-MY_P2="CBFlib_0.9.2" |
| 195 |
- |
| 196 |
-DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files" |
| 197 |
-HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" |
| 198 |
-SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz |
| 199 |
- test? ( |
| 200 |
- mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz |
| 201 |
- mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz |
| 202 |
- )" |
| 203 |
- |
| 204 |
-LICENSE="GPL-2" |
| 205 |
-SLOT="0" |
| 206 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 207 |
-IUSE="doc test" |
| 208 |
- |
| 209 |
-DEPEND="virtual/fortran" |
| 210 |
-RDEPEND="${DEPEND}" |
| 211 |
-#test? ( sys-process/time )" |
| 212 |
- |
| 213 |
-S=${WORKDIR}/${MY_P1} |
| 214 |
- |
| 215 |
-src_prepare(){ |
| 216 |
- rm -rf Py* drel* dRel* ply* |
| 217 |
- epatch "${FILESDIR}"/${PV}-Makefile.patch |
| 218 |
- cp Makefile_LINUX_gcc42 Makefile |
| 219 |
- |
| 220 |
- append-fflags -fno-range-check |
| 221 |
- append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG |
| 222 |
- |
| 223 |
- sed \ |
| 224 |
- -e "s|^CC.*$|CC = $(tc-getCC)|" \ |
| 225 |
- -e "s|^C++.*$|C++ = $(tc-getCXX)|" \ |
| 226 |
- -e "s|C++|CXX|g" \ |
| 227 |
- -e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \ |
| 228 |
- -e "s|^F90C.*$|F90C = $(tc-getFC)|" \ |
| 229 |
- -e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \ |
| 230 |
- -e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \ |
| 231 |
- -e "s| /bin| ${EPREFIX}/bin|g" \ |
| 232 |
- -e "s|/usr|${EPREFIX}/usr|g" \ |
| 233 |
- -i Makefile || die |
| 234 |
-} |
| 235 |
- |
| 236 |
-src_compile() { |
| 237 |
- emake -j1 shared |
| 238 |
-} |
| 239 |
- |
| 240 |
-src_test(){ |
| 241 |
- emake -j1 basic |
| 242 |
-} |
| 243 |
- |
| 244 |
-src_install() { |
| 245 |
- insinto /usr/include/${PN} |
| 246 |
- doins include/*.h |
| 247 |
- |
| 248 |
- dolib.so solib/lib* |
| 249 |
- |
| 250 |
- dodoc README |
| 251 |
- if use doc; then |
| 252 |
- dohtml -r README.html html_graphics doc |
| 253 |
- fi |
| 254 |
-} |
| 255 |
|
| 256 |
diff --git a/sci-libs/cbflib/files/0.9.0-Makefile.patch b/sci-libs/cbflib/files/0.9.0-Makefile.patch |
| 257 |
deleted file mode 100644 |
| 258 |
index 914152c..0000000 |
| 259 |
--- a/sci-libs/cbflib/files/0.9.0-Makefile.patch |
| 260 |
+++ /dev/null |
| 261 |
@@ -1,104 +0,0 @@ |
| 262 |
-diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 263 |
-index 52c5286..5c894a0 100644 |
| 264 |
---- a/Makefile_LINUX_gcc42 |
| 265 |
-+++ b/Makefile_LINUX_gcc42 |
| 266 |
-@@ -250,7 +250,10 @@ |
| 267 |
- |
| 268 |
- |
| 269 |
- # Version string |
| 270 |
--VERSION = 0.9.0 |
| 271 |
-+MAJOR = 0 |
| 272 |
-+MINOR = 9 |
| 273 |
-+MICRO = 0 |
| 274 |
-+VERSION = ${MAJOR}.${MINOR}.${MICRO} |
| 275 |
- |
| 276 |
- |
| 277 |
- # |
| 278 |
-@@ -282,7 +285,7 @@ SHAR = /usr/bin/shar |
| 279 |
- # |
| 280 |
- # Program to use to create archives |
| 281 |
- # |
| 282 |
--AR = /usr/bin/ar |
| 283 |
-+AR = ar |
| 284 |
- |
| 285 |
- # |
| 286 |
- # Program to use to add an index to an archive |
| 287 |
-@@ -292,13 +295,13 @@ RANLIB = /usr/bin/ranlib |
| 288 |
- # |
| 289 |
- # Program to use to decompress a data file |
| 290 |
- # |
| 291 |
--DECOMPRESS = /usr/bin/bunzip2 |
| 292 |
-+DECOMPRESS = bunzip2 |
| 293 |
- |
| 294 |
- |
| 295 |
- # |
| 296 |
- # Program to use to compress a data file |
| 297 |
- # |
| 298 |
--COMPRESS = /usr/bin/bzip2 |
| 299 |
-+COMPRESS = bzip2 |
| 300 |
- |
| 301 |
- # |
| 302 |
- # Program to use to generate a signature |
| 303 |
-@@ -486,9 +489,9 @@ F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \ |
| 304 |
- $(SRC)/fcb_read_image.f90 \ |
| 305 |
- $(SRC)/fcb_read_line.f90 \ |
| 306 |
- $(SRC)/fcb_read_xds_i2.f90 \ |
| 307 |
-- $(SRC)/fcb_skip_whitespace.f90 \ |
| 308 |
-- $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 309 |
-- $(EXAMPLES)/test_xds_binary.f90 |
| 310 |
-+ $(SRC)/fcb_skip_whitespace.f90 |
| 311 |
-+# $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 312 |
-+# $(EXAMPLES)/test_xds_binary.f90 |
| 313 |
- |
| 314 |
- |
| 315 |
- # |
| 316 |
-@@ -663,7 +666,7 @@ all:: $(BIN)/test_xds_binary \ |
| 317 |
- $(BIN)/test_fcb_read_image |
| 318 |
- endif |
| 319 |
- |
| 320 |
--shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so |
| 321 |
-+shared: $(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION} |
| 322 |
- |
| 323 |
- javawrapper: shared $(JAVADIR) $(JAVADIR)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so |
| 324 |
- |
| 325 |
-@@ -846,10 +849,11 @@ ifneq ($(RANLIB),) |
| 326 |
- $(RANLIB) $@ |
| 327 |
- endif |
| 328 |
- |
| 329 |
--$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 330 |
-+$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 331 |
- $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 332 |
- mv *.o $(SOLIB) |
| 333 |
-- $(CC) -o $@ $(SOLIB)/*.o $(SOLDFLAGS) $(EXTRALIBS) |
| 334 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) |
| 335 |
-+ ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so |
| 336 |
- |
| 337 |
- # |
| 338 |
- # IMG library |
| 339 |
-@@ -862,9 +866,10 @@ ifneq ($(RANLIB),) |
| 340 |
- endif |
| 341 |
- rm img.o |
| 342 |
- |
| 343 |
--$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 344 |
-+$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 345 |
- $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 346 |
-- $(CC) -o $@ img.o $(SOLDFLAGS) |
| 347 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o |
| 348 |
-+ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so |
| 349 |
- rm img.o |
| 350 |
- |
| 351 |
- # |
| 352 |
-@@ -888,10 +893,11 @@ else |
| 353 |
- echo "Define F90C to build $(LIB)/libfcb.a" |
| 354 |
- endif |
| 355 |
- |
| 356 |
--$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 357 |
-+$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 358 |
- ifneq ($(F90C),) |
| 359 |
- $(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 360 |
-- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS) |
| 361 |
-+ $(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o |
| 362 |
-+ ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so |
| 363 |
- rm *.o |
| 364 |
- else |
| 365 |
- echo "Define F90C to build $(SOLIB)/libfcb.so" |
| 366 |
|
| 367 |
diff --git a/sci-libs/cbflib/files/0.9.0-python.patch b/sci-libs/cbflib/files/0.9.0-python.patch |
| 368 |
deleted file mode 100644 |
| 369 |
index b18d019..0000000 |
| 370 |
--- a/sci-libs/cbflib/files/0.9.0-python.patch |
| 371 |
+++ /dev/null |
| 372 |
@@ -1,16 +0,0 @@ |
| 373 |
-diff --git a/pycbf/setup.py b/pycbf/setup.py |
| 374 |
-index 0763f06..7fe9ccc 100644 |
| 375 |
---- a/pycbf/setup.py |
| 376 |
-+++ b/pycbf/setup.py |
| 377 |
-@@ -9,9 +9,9 @@ from distutils.core import setup, Extension |
| 378 |
- e = Extension('_pycbf', |
| 379 |
- sources = ["pycbf_wrap.c","../src/cbf_simple.c"], |
| 380 |
- extra_compile_args=["-g"], |
| 381 |
-- library_dirs=["../lib/"], |
| 382 |
-+ library_dirs=["../solib/"], |
| 383 |
- libraries=["cbf"], |
| 384 |
- include_dirs = ["../include"] ) |
| 385 |
- |
| 386 |
- # Build it |
| 387 |
--setup(name="_pycbf",ext_modules=[e],) |
| 388 |
-+setup(name="_pycbf",ext_modules=[e],py_modules=["pycbf"],) |
| 389 |
|
| 390 |
diff --git a/sci-libs/cbflib/files/0.9.2.10-Makefile.patch b/sci-libs/cbflib/files/0.9.2.10-Makefile.patch |
| 391 |
deleted file mode 100644 |
| 392 |
index 9c72300..0000000 |
| 393 |
--- a/sci-libs/cbflib/files/0.9.2.10-Makefile.patch |
| 394 |
+++ /dev/null |
| 395 |
@@ -1,269 +0,0 @@ |
| 396 |
- Makefile_LINUX_gcc42 | 93 ++++++++++++++++++++++++++++------------------------ |
| 397 |
- 1 file changed, 50 insertions(+), 43 deletions(-) |
| 398 |
- |
| 399 |
-diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 400 |
-index 0aa639a..071863d 100644 |
| 401 |
---- a/Makefile_LINUX_gcc42 |
| 402 |
-+++ b/Makefile_LINUX_gcc42 |
| 403 |
-@@ -250,7 +250,11 @@ |
| 404 |
- |
| 405 |
- |
| 406 |
- # Version string |
| 407 |
--VERSION = 0.9.2 |
| 408 |
-+MAJOR = 0 |
| 409 |
-+MINOR = 9 |
| 410 |
-+MICRO = 3 |
| 411 |
-+VERSION = ${MAJOR}.${MINOR}.${MICRO} |
| 412 |
-+ |
| 413 |
- |
| 414 |
- |
| 415 |
- # |
| 416 |
-@@ -297,12 +301,12 @@ SHAR = /usr/bin/shar |
| 417 |
- # |
| 418 |
- # Program to use to create archives |
| 419 |
- # |
| 420 |
--AR = /usr/bin/ar |
| 421 |
-+AR ?= ar |
| 422 |
- |
| 423 |
- # |
| 424 |
- # Program to use to add an index to an archive |
| 425 |
- # |
| 426 |
--RANLIB = /usr/bin/ranlib |
| 427 |
-+RANLIB ?= ranlib |
| 428 |
- |
| 429 |
- # |
| 430 |
- # Program to use to decompress a data file |
| 431 |
-@@ -313,7 +317,7 @@ DECOMPRESS = bunzip2 |
| 432 |
- # |
| 433 |
- # Program to use to compress a data file |
| 434 |
- # |
| 435 |
--COMPRESS = /usr/bin/bzip2 |
| 436 |
-+COMPRESS = bzip2 |
| 437 |
- |
| 438 |
- # |
| 439 |
- # Program to use to generate a signature |
| 440 |
-@@ -410,12 +414,12 @@ SETUP_PY = setup.py |
| 441 |
- # with gcc version 4.2 |
| 442 |
- # |
| 443 |
- ######################################################### |
| 444 |
--CC = gcc |
| 445 |
--C++ = g++ |
| 446 |
--CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing |
| 447 |
--F90C = gfortran |
| 448 |
--F90FLAGS = -g -fno-range-check |
| 449 |
--F90LDFLAGS = |
| 450 |
-+CC ?= gcc |
| 451 |
-+CXX ?= g++ |
| 452 |
-+CFLAGS += -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing |
| 453 |
-+FC ?= gfortran |
| 454 |
-+FCFLAGS += -g -fno-range-check |
| 455 |
-+LDFLAGS += |
| 456 |
- SOCFLAGS = -fPIC |
| 457 |
- SOLDFLAGS = -shared -Wl,-rpath,$(INSTALLDIR)/lib |
| 458 |
- JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux |
| 459 |
-@@ -425,7 +429,7 @@ M4FLAGS = -Dfcb_bytes_in_rec=131072 |
| 460 |
- TIME = time |
| 461 |
- |
| 462 |
- ifneq ($(NOFORTRAN),) |
| 463 |
--F90C = |
| 464 |
-+FC = |
| 465 |
- endif |
| 466 |
- |
| 467 |
- # |
| 468 |
-@@ -491,9 +495,9 @@ RTLPEXPORTS = export LD_LIBRARY_PATH=$(PWD)/solib:$(PWD)/lib;\ |
| 469 |
- .m4.f90: |
| 470 |
- m4 -P $(M4FLAGS) $< > $@ |
| 471 |
- |
| 472 |
--ifneq ($(F90C),) |
| 473 |
-+ifneq ($(FC),) |
| 474 |
- .f90.o: |
| 475 |
-- $(F90C) $(F90FLAGS) -c $< -o $@ |
| 476 |
-+ $(FC) $(FCFLAGS) -c $< -o $@ |
| 477 |
- endif |
| 478 |
- |
| 479 |
- |
| 480 |
-@@ -701,7 +705,7 @@ default: |
| 481 |
- # |
| 482 |
- # Compile the library and examples |
| 483 |
- # |
| 484 |
--all:: $(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) $(HDF5)\ |
| 485 |
-+all:: $(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) \ |
| 486 |
- symlinksdone \ |
| 487 |
- $(REGEXDEP) \ |
| 488 |
- $(LIB)/libcbf.a \ |
| 489 |
-@@ -725,12 +729,12 @@ all:: $(BIN) $(SOURCE) $(F90SOURCE) $(HEADERS) $(HDF5)\ |
| 490 |
- $(BIN)/tiff2cbf |
| 491 |
- |
| 492 |
- |
| 493 |
--ifneq ($(F90C),) |
| 494 |
-+ifneq ($(FC),) |
| 495 |
- all:: $(BIN)/test_xds_binary \ |
| 496 |
- $(BIN)/test_fcb_read_image |
| 497 |
- endif |
| 498 |
- |
| 499 |
--shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so |
| 500 |
-+shared: $(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION} |
| 501 |
- |
| 502 |
- javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so |
| 503 |
- |
| 504 |
-@@ -969,7 +973,7 @@ $(SRC)/cbf_stx.c: $(SRC)/cbf.stx.y |
| 505 |
- # |
| 506 |
- # CBF library |
| 507 |
- # |
| 508 |
--$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB) $(HDF5) |
| 509 |
-+$(LIB)/libcbf.a: $(SOURCE) $(HEADERS) $(COMMONDEP) $(LIB) |
| 510 |
- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 511 |
- $(AR) cr $@ *.o |
| 512 |
- mv *.o $(LIB) |
| 513 |
-@@ -977,10 +981,11 @@ ifneq ($(RANLIB),) |
| 514 |
- $(RANLIB) $@ |
| 515 |
- endif |
| 516 |
- |
| 517 |
--$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) $(HDF5) |
| 518 |
-- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 519 |
-- $(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS) $(HDF5SOLIBS) |
| 520 |
-- rm *.o |
| 521 |
-+$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 522 |
-+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 523 |
-+ mv *.o $(SOLIB) |
| 524 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) $(HDF5SOLIBS) |
| 525 |
-+ ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so |
| 526 |
- |
| 527 |
- # |
| 528 |
- # IMG library |
| 529 |
-@@ -993,9 +998,10 @@ ifneq ($(RANLIB),) |
| 530 |
- endif |
| 531 |
- rm img.o |
| 532 |
- |
| 533 |
--$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 534 |
-- $(CC) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 535 |
-- $(CC) -o $@ img.o $(SOLDFLAGS) |
| 536 |
-+$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 537 |
-+ $(CC) $(CFLAGS) $(NOREGEXFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 538 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o -lm |
| 539 |
-+ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so |
| 540 |
- rm img.o |
| 541 |
- |
| 542 |
- # |
| 543 |
-@@ -1007,25 +1013,26 @@ CBF_IMG_LIBS: $(LIB)/libcbf.a $(LIB)/libimg.a |
| 544 |
- # |
| 545 |
- # FCB library |
| 546 |
- # |
| 547 |
--$(LIB)/libfcb.a: $(F90SOURCE) $(COMMONDEP) $(LIB) $(HDF5) |
| 548 |
--ifneq ($(F90C),) |
| 549 |
-- $(F90C) $(F90FLAGS) -c $(F90SOURCE) |
| 550 |
-+$(LIB)/libfcb.a: $(F90SOURCE) $(COMMONDEP) $(LIB) |
| 551 |
-+ifneq ($(FC),) |
| 552 |
-+ $(FC) $(FCFLAGS) -c $(F90SOURCE) |
| 553 |
- $(AR) cr $@ *.o |
| 554 |
- ifneq ($(RANLIB),) |
| 555 |
- $(RANLIB) $@ |
| 556 |
- endif |
| 557 |
- rm *.o |
| 558 |
- else |
| 559 |
-- echo "Define F90C to build $(LIB)/libfcb.a" |
| 560 |
-+ echo "Define FC to build $(LIB)/libfcb.a" |
| 561 |
- endif |
| 562 |
- |
| 563 |
--$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 564 |
--ifneq ($(F90C),) |
| 565 |
-- $(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 566 |
-- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS) |
| 567 |
-+$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 568 |
-+ifneq ($(FC),) |
| 569 |
-+ $(FC) $(FCFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 570 |
-+ $(FC) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(FCFLAGS) -o $@ *.o |
| 571 |
-+ ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so |
| 572 |
- rm *.o |
| 573 |
- else |
| 574 |
-- echo "Define F90C to build $(SOLIB)/libfcb.so" |
| 575 |
-+ echo "Define FC to build $(SOLIB)/libfcb.so" |
| 576 |
- endif |
| 577 |
- |
| 578 |
- |
| 579 |
-@@ -1183,7 +1190,7 @@ $(BIN)/cbf_template_t: $(DECTRIS_EXAMPLES)/cbf_template_t.c \ |
| 580 |
- # testcell example program |
| 581 |
- # |
| 582 |
- $(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C |
| 583 |
-- $(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \ |
| 584 |
-+ $(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \ |
| 585 |
- $(EXAMPLES)/testcell.C -L$(LIB) \ |
| 586 |
- -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@ |
| 587 |
- |
| 588 |
-@@ -1191,7 +1198,7 @@ $(BIN)/testcell: $(LIB)/libcbf.a $(EXAMPLES)/testcell.C |
| 589 |
- # cif2c example program |
| 590 |
- # |
| 591 |
- $(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c |
| 592 |
-- $(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \ |
| 593 |
-+ $(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \ |
| 594 |
- $(EXAMPLES)/cif2c.c -L$(LIB) \ |
| 595 |
- -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@ |
| 596 |
- |
| 597 |
-@@ -1199,7 +1206,7 @@ $(BIN)/cif2c: $(LIB)/libcbf.a $(EXAMPLES)/cif2c.c |
| 598 |
- # sauter_test example program |
| 599 |
- # |
| 600 |
- $(BIN)/sauter_test: $(LIB)/libcbf.a $(EXAMPLES)/sauter_test.C |
| 601 |
-- $(C++) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \ |
| 602 |
-+ $(CXX) $(CFLAGS) $(NOLLFLAG) $(NOREGEXFLAG) $(INCLUDES) $(WARNINGS) \ |
| 603 |
- $(EXAMPLES)/sauter_test.C -L$(LIB) \ |
| 604 |
- -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@ |
| 605 |
- |
| 606 |
-@@ -1253,19 +1260,19 @@ $(BIN)/testflatpacked: $(LIB)/libcbf.a $(EXAMPLES)/testflatpacked.c |
| 607 |
- $(EXAMPLES)/testflatpacked.c -L$(LIB) \ |
| 608 |
- -lcbf $(EXTRALIBS) $(HDF5LIBS) -o $@ |
| 609 |
- |
| 610 |
--ifneq ($(F90C),) |
| 611 |
-+ifneq ($(FC),) |
| 612 |
- # |
| 613 |
- # test_xds_binary example program |
| 614 |
- # |
| 615 |
- $(BIN)/test_xds_binary: $(LIB)/libfcb.a $(EXAMPLES)/test_xds_binary.f90 |
| 616 |
-- $(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \ |
| 617 |
-+ $(FC) $(FCFLAGS) $(LDFLAGS) $(EXAMPLES)/test_xds_binary.f90 \ |
| 618 |
- -L$(LIB) -lfcb -o $@ |
| 619 |
- |
| 620 |
- # |
| 621 |
- # test_fcb_read_image example program |
| 622 |
- # |
| 623 |
- $(BIN)/test_fcb_read_image: $(LIB)/libfcb.a $(EXAMPLES)/test_fcb_read_image.f90 |
| 624 |
-- $(F90C) $(F90FLAGS) $(F90LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 625 |
-+ $(FC) $(FCFLAGS) $(LDFLAGS) $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 626 |
- -L$(LIB) -lfcb -o $@ |
| 627 |
- endif |
| 628 |
- |
| 629 |
-@@ -1520,7 +1527,7 @@ basic: $(BIN)/makecbf $(BIN)/img2cif $(BIN)/cif2cbf $(TESTINPUT_BASIC) |
| 630 |
- # |
| 631 |
- # Extra Tests |
| 632 |
- # |
| 633 |
--ifneq ($(F90C),) |
| 634 |
-+ifneq ($(FC),) |
| 635 |
- extra: $(BIN)/convert_image $(BIN)/convert_minicbf $(BIN)/cif2cbf $(BIN)/testcell \ |
| 636 |
- $(BIN)/testreals $(BIN)/testflat $(BIN)/testflatpacked \ |
| 637 |
- $(BIN)/test_xds_binary $(BIN)/test_fcb_read_image $(BIN)/convert_minicbf \ |
| 638 |
-@@ -1582,7 +1589,7 @@ endif |
| 639 |
- -cmp testflatin.cbf testflatout.cbf |
| 640 |
- $(TIME) $(BIN)/testflatpacked |
| 641 |
- -cmp testflatpackedin.cbf testflatpackedout.cbf |
| 642 |
--ifneq ($(F90C),) |
| 643 |
-+ifneq ($(FC),) |
| 644 |
- echo testflatout.cbf | $(TIME) $(BIN)/test_xds_binary > test_xds_bin_testflatout.out |
| 645 |
- -$(DIFF) test_xds_bin_testflatout.out test_xds_bin_testflatout_orig.out |
| 646 |
- echo testflatpackedout.cbf | $(TIME) $(BIN)/test_xds_binary > test_xds_bin_testflatpackedout.out |
| 647 |
-@@ -1599,7 +1606,7 @@ endif |
| 648 |
- $(TIME) $(BIN)/cif2cbf -I 4 -C 100. -L 0. -e n -c b -i XRD1621.cbf -o XRD1621_I4encbC100.cbf |
| 649 |
- -$(DIFF) XRD1621_I4encbC100.cbf XRD1621_I4encbC100_orig.cbf |
| 650 |
- |
| 651 |
--ifneq ($(F90C),) |
| 652 |
-+ifneq ($(FC),) |
| 653 |
- extra_sigs_only: $(BIN)/convert_image $(BIN)/convert_minicbf $(BIN)/cif2cbf $(BIN)/testcell \ |
| 654 |
- $(BIN)/testreals $(BIN)/testflat $(BIN)/testflatpacked \ |
| 655 |
- $(BIN)/test_xds_binary $(BIN)/test_fcb_read_image $(BIN)/convert_minicbf \ |
| 656 |
-@@ -1650,7 +1657,7 @@ endif |
| 657 |
- -cmp testflatin.cbf testflatout.cbf |
| 658 |
- $(TIME) $(BIN)/testflatpacked |
| 659 |
- -cmp testflatpackedin.cbf testflatpackedout.cbf |
| 660 |
--ifneq ($(F90C),) |
| 661 |
-+ifneq ($(FC),) |
| 662 |
- echo testflatout.cbf | $(TIME) $(BIN)/test_xds_binary | \ |
| 663 |
- $(SIGNATURE) | $(DIFF) - test_xds_bin_testflatout_orig.out$(SEXT) |
| 664 |
- echo testflatpackedout.cbf | $(TIME) $(BIN)/test_xds_binary | \ |
| 665 |
|
| 666 |
diff --git a/sci-libs/cbflib/files/0.9.2.2-Makefile.patch b/sci-libs/cbflib/files/0.9.2.2-Makefile.patch |
| 667 |
deleted file mode 100644 |
| 668 |
index a257603..0000000 |
| 669 |
--- a/sci-libs/cbflib/files/0.9.2.2-Makefile.patch |
| 670 |
+++ /dev/null |
| 671 |
@@ -1,150 +0,0 @@ |
| 672 |
-From 44e303d998c72d5d502705895a536b3657a7c4c5 Mon Sep 17 00:00:00 2001 |
| 673 |
-Message-Id: <44e303d998c72d5d502705895a536b3657a7c4c5.1323790511.git.jlec@g.o> |
| 674 |
-From: Justin Lecher <jlec@g.o> |
| 675 |
-Date: Tue, 13 Dec 2011 16:10:43 +0100 |
| 676 |
-Subject: [PATCH] 0.9.0 Makefile.patch |
| 677 |
- |
| 678 |
-Conflicts: |
| 679 |
- |
| 680 |
- Makefile_LINUX_gcc42 |
| 681 |
---- |
| 682 |
- Makefile_LINUX_gcc42 | 63 ++++++++++++++++++++++++++----------------------- |
| 683 |
- 1 files changed, 33 insertions(+), 30 deletions(-) |
| 684 |
- |
| 685 |
-diff --git a/Makefile_LINUX_gcc42 b/Makefile_LINUX_gcc42 |
| 686 |
-index a74be5f..1cfb066 100644 |
| 687 |
---- a/Makefile_LINUX_gcc42 |
| 688 |
-+++ b/Makefile_LINUX_gcc42 |
| 689 |
-@@ -250,7 +250,10 @@ |
| 690 |
- |
| 691 |
- |
| 692 |
- # Version string |
| 693 |
--VERSION = 0.9.2 |
| 694 |
-+MAJOR = 0 |
| 695 |
-+MINOR = 9 |
| 696 |
-+MICRO = 2 |
| 697 |
-+VERSION = ${MAJOR}.${MINOR}.${MICRO} |
| 698 |
- |
| 699 |
- |
| 700 |
- # |
| 701 |
-@@ -290,7 +293,7 @@ SHAR = /usr/bin/shar |
| 702 |
- # |
| 703 |
- # Program to use to create archives |
| 704 |
- # |
| 705 |
--AR = /usr/bin/ar |
| 706 |
-+AR = ar |
| 707 |
- |
| 708 |
- # |
| 709 |
- # Program to use to add an index to an archive |
| 710 |
-@@ -300,13 +303,13 @@ RANLIB = /usr/bin/ranlib |
| 711 |
- # |
| 712 |
- # Program to use to decompress a data file |
| 713 |
- # |
| 714 |
--DECOMPRESS = /usr/bin/bunzip2 |
| 715 |
-+DECOMPRESS = bunzip2 |
| 716 |
- |
| 717 |
- |
| 718 |
- # |
| 719 |
- # Program to use to compress a data file |
| 720 |
- # |
| 721 |
--COMPRESS = /usr/bin/bzip2 |
| 722 |
-+COMPRESS = bzip2 |
| 723 |
- |
| 724 |
- # |
| 725 |
- # Program to use to generate a signature |
| 726 |
-@@ -509,21 +512,18 @@ SOURCE = $(SRC)/cbf.c \ |
| 727 |
- |
| 728 |
- |
| 729 |
- F90SOURCE = $(SRC)/fcb_atol_wcnt.f90 \ |
| 730 |
-- $(SRC)/fcb_ci_strncmparr.f90 \ |
| 731 |
-- $(SRC)/fcb_exit_binary.f90 \ |
| 732 |
-- $(SRC)/fcb_nblen_array.f90 \ |
| 733 |
-- $(SRC)/fcb_next_binary.f90 \ |
| 734 |
-- $(SRC)/fcb_open_cifin.f90 \ |
| 735 |
-- $(SRC)/fcb_packed.f90 \ |
| 736 |
-- $(SRC)/fcb_read_bits.f90 \ |
| 737 |
-- $(SRC)/fcb_read_byte.f90 \ |
| 738 |
-- $(SRC)/fcb_read_image.f90 \ |
| 739 |
-- $(SRC)/fcb_read_line.f90 \ |
| 740 |
-- $(SRC)/fcb_read_xds_i2.f90 \ |
| 741 |
-- $(SRC)/fcb_skip_whitespace.f90 \ |
| 742 |
-- $(EXAMPLES)/test_fcb_read_image.f90 \ |
| 743 |
-- $(EXAMPLES)/test_xds_binary.f90 |
| 744 |
-- |
| 745 |
-+ $(SRC)/fcb_ci_strncmparr.f90 \ |
| 746 |
-+ $(SRC)/fcb_exit_binary.f90 \ |
| 747 |
-+ $(SRC)/fcb_nblen_array.f90 \ |
| 748 |
-+ $(SRC)/fcb_next_binary.f90 \ |
| 749 |
-+ $(SRC)/fcb_open_cifin.f90 \ |
| 750 |
-+ $(SRC)/fcb_packed.f90 \ |
| 751 |
-+ $(SRC)/fcb_read_bits.f90 \ |
| 752 |
-+ $(SRC)/fcb_read_byte.f90 \ |
| 753 |
-+ $(SRC)/fcb_read_image.f90 \ |
| 754 |
-+ $(SRC)/fcb_read_line.f90 \ |
| 755 |
-+ $(SRC)/fcb_read_xds_i2.f90 \ |
| 756 |
-+ $(SRC)/fcb_skip_whitespace.f90 |
| 757 |
- |
| 758 |
- # |
| 759 |
- # Header files |
| 760 |
-@@ -701,7 +701,7 @@ all:: $(BIN)/test_xds_binary \ |
| 761 |
- $(BIN)/test_fcb_read_image |
| 762 |
- endif |
| 763 |
- |
| 764 |
--shared: $(SOLIB)/libcbf.so $(SOLIB)/libfcb.so $(SOLIB)/libimg.so |
| 765 |
-+shared: $(SOLIB)/libcbf.so.${VERSION} $(SOLIB)/libfcb.so.${VERSION} $(SOLIB)/libimg.so.${VERSION} |
| 766 |
- |
| 767 |
- javawrapper: shared $(JCBF) $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so |
| 768 |
- |
| 769 |
-@@ -915,25 +915,27 @@ ifneq ($(RANLIB),) |
| 770 |
- $(RANLIB) $@ |
| 771 |
- endif |
| 772 |
- |
| 773 |
--$(SOLIB)/libcbf.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 774 |
-- $(CC) $(CFLAGS) $(NOLLFLAG) $(PYCIFRWFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 775 |
-- $(CC) -o $@ *.o $(SOLDFLAGS) $(EXTRALIBS) |
| 776 |
-- rm *.o |
| 777 |
-+$(SOLIB)/libcbf.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 778 |
-+ $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(SOURCE) |
| 779 |
-+ mv *.o $(SOLIB) |
| 780 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,libcbf.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ $(SOLIB)/*.o $(EXTRALIBS) |
| 781 |
-+ ln -sf libcbf.so.$(VERSION) $(SOLIB)/libcbf.so |
| 782 |
- |
| 783 |
- # |
| 784 |
- # IMG library |
| 785 |
- # |
| 786 |
- $(LIB)/libimg.a: $(EXAMPLES)/img.c $(HEADERS) $(COMMONDEP) $(LIB) |
| 787 |
-- $(CC) $(CFLAGS) $(NOLLFLAG) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 788 |
-+ $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 789 |
- $(AR) cr $@ img.o |
| 790 |
- ifneq ($(RANLIB),) |
| 791 |
- $(RANLIB) $@ |
| 792 |
- endif |
| 793 |
- rm img.o |
| 794 |
- |
| 795 |
--$(SOLIB)/libimg.so: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 796 |
-- $(CC) $(CFLAGS) $(NOLLFLAG) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 797 |
-- $(CC) -o $@ img.o $(SOLDFLAGS) |
| 798 |
-+$(SOLIB)/libimg.so.${VERSION}: $(SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 799 |
-+ $(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(EXAMPLES)/img.c |
| 800 |
-+ $(CC) $(LDFLAGS) -Wl,-soname,libimg.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) -o $@ img.o |
| 801 |
-+ ln -sf libimg.so.$(VERSION) $(SOLIB)/libimg.so |
| 802 |
- rm img.o |
| 803 |
- |
| 804 |
- # |
| 805 |
-@@ -957,10 +959,11 @@ else |
| 806 |
- echo "Define F90C to build $(LIB)/libfcb.a" |
| 807 |
- endif |
| 808 |
- |
| 809 |
--$(SOLIB)/libfcb.so: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 810 |
-+$(SOLIB)/libfcb.so.${VERSION}: $(F90SOURCE) $(HEADERS) $(COMMONDEP) $(SOLIB) |
| 811 |
- ifneq ($(F90C),) |
| 812 |
- $(F90C) $(F90FLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(F90SOURCE) |
| 813 |
-- $(F90C) $(F90FLAGS) -o $@ *.o $(SOLDFLAGS) |
| 814 |
-+ $(F90C) $(LDFLAGS) -Wl,-soname,libfcb.so.$(VERSION) $(SOCFLAGS) $(SOLDFLAGS) $(F90FLAGS) -o $@ *.o |
| 815 |
-+ ln -sf libfcb.so.$(VERSION) $(SOLIB)/libfcb.so |
| 816 |
- rm *.o |
| 817 |
- else |
| 818 |
- echo "Define F90C to build $(SOLIB)/libfcb.so" |
| 819 |
--- |
| 820 |
-1.7.8 |
| 821 |
- |
Archives