From 132076edbcc2f60b6ba5be2f30eca5ef719a289a Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Wed, 2 May 2007 16:01:42 +0000 Subject: [PATCH] removed obsolete versions. Fixed bug #174968, thanks to MaratIK Package-Manager: portage-2.1.2.2 --- sci-libs/fftw/ChangeLog | 9 +- sci-libs/fftw/Manifest | 67 +++------- sci-libs/fftw/fftw-2.1.5-r2.ebuild | 144 --------------------- sci-libs/fftw/fftw-3.0.1-r1.ebuild | 101 --------------- sci-libs/fftw/fftw-3.0.1-r2.ebuild | 10 +- sci-libs/fftw/fftw-3.0.1.ebuild | 89 ------------- sci-libs/fftw/fftw-3.1.1.ebuild | 120 ----------------- sci-libs/fftw/fftw-3.1.ebuild | 89 ------------- sci-libs/fftw/files/digest-fftw-2.1.5-r2 | 3 - sci-libs/fftw/files/digest-fftw-3.0.1 | 3 - sci-libs/fftw/files/digest-fftw-3.0.1-r1 | 3 - sci-libs/fftw/files/digest-fftw-3.1 | 3 - sci-libs/fftw/files/digest-fftw-3.1.1 | 3 - sci-libs/fftw/files/fftw-3.0.1-amd64.patch | 66 ++++++++++ sci-libs/fftw/files/fftw-ppc-macos.1.patch | 30 ----- 15 files changed, 98 insertions(+), 642 deletions(-) delete mode 100644 sci-libs/fftw/fftw-2.1.5-r2.ebuild delete mode 100644 sci-libs/fftw/fftw-3.0.1-r1.ebuild delete mode 100644 sci-libs/fftw/fftw-3.0.1.ebuild delete mode 100644 sci-libs/fftw/fftw-3.1.1.ebuild delete mode 100644 sci-libs/fftw/fftw-3.1.ebuild delete mode 100644 sci-libs/fftw/files/digest-fftw-2.1.5-r2 delete mode 100644 sci-libs/fftw/files/digest-fftw-3.0.1 delete mode 100644 sci-libs/fftw/files/digest-fftw-3.0.1-r1 delete mode 100644 sci-libs/fftw/files/digest-fftw-3.1 delete mode 100644 sci-libs/fftw/files/digest-fftw-3.1.1 create mode 100644 sci-libs/fftw/files/fftw-3.0.1-amd64.patch delete mode 100644 sci-libs/fftw/files/fftw-ppc-macos.1.patch diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 330894018bce..220c25aff5f8 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/fftw # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.49 2007/04/30 16:44:54 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.50 2007/05/02 16:01:42 bicatali Exp $ + + 02 May 2007; Sébastien Fabbro + +files/fftw-3.0.1-amd64.patch, -files/fftw-ppc-macos.1.patch, + -fftw-2.1.5-r2.ebuild, -fftw-3.0.1.ebuild, -fftw-3.0.1-r1.ebuild, + fftw-3.0.1-r2.ebuild, -fftw-3.1.ebuild, -fftw-3.1.1.ebuild: + removed obsolete versions. Fixed bug #174968, thanks to MaratIK + *fftw-2.1.5-r3 (30 Apr 2007) diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index bc822d7ab8ba..96ecc61e22aa 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -13,91 +13,54 @@ AUX fftw-3.0.1-altivec.patch 2585 RMD160 ac3e6a4edd4183570c214e39ec900da432162cf MD5 49836a250acfcc913276a29736c68a3b files/fftw-3.0.1-altivec.patch 2585 RMD160 ac3e6a4edd4183570c214e39ec900da432162cfb files/fftw-3.0.1-altivec.patch 2585 SHA256 48bbd87433b208490f907fc340ab53cabcb8e4259776eadfdf15d963e4af0a27 files/fftw-3.0.1-altivec.patch 2585 +AUX fftw-3.0.1-amd64.patch 2140 RMD160 57b820b3be344639fc73f62d3d037fda3924ac78 SHA1 0b86a7884e85e04546d30b35b00b03406e654a37 SHA256 0387d13327d069a1f148d92309eac568f8c08158dc83cef6e195362fa1ccb8fb +MD5 75a37358f975afaf7d0a652175188906 files/fftw-3.0.1-amd64.patch 2140 +RMD160 57b820b3be344639fc73f62d3d037fda3924ac78 files/fftw-3.0.1-amd64.patch 2140 +SHA256 0387d13327d069a1f148d92309eac568f8c08158dc83cef6e195362fa1ccb8fb files/fftw-3.0.1-amd64.patch 2140 AUX fftw-altivec-headers.patch 753 RMD160 01db3ce957b0c9399045673a6d43c87029169446 SHA1 37c0cc757e8375347dfb1eafd6c6b060f8efb079 SHA256 0e20d131a9dbde7464f20084dff2f273bbd2152e28580af4886c6ec3b5747dae MD5 6ef94bc329f355e86cdee562cc056522 files/fftw-altivec-headers.patch 753 RMD160 01db3ce957b0c9399045673a6d43c87029169446 files/fftw-altivec-headers.patch 753 SHA256 0e20d131a9dbde7464f20084dff2f273bbd2152e28580af4886c6ec3b5747dae files/fftw-altivec-headers.patch 753 -AUX fftw-ppc-macos.1.patch 1429 RMD160 c61bedd5ba54e526f138525eb7d77bcbb3264a28 SHA1 a1d25939cb85306eadaad3da0a130620c4ee32d5 SHA256 d16d27be36800fa582402847e4b6fb0210bcc9718ac750c980b12e1de1419dfb -MD5 148e5318eca8afb3a4856c820727e69c files/fftw-ppc-macos.1.patch 1429 -RMD160 c61bedd5ba54e526f138525eb7d77bcbb3264a28 files/fftw-ppc-macos.1.patch 1429 -SHA256 d16d27be36800fa582402847e4b6fb0210bcc9718ac750c980b12e1de1419dfb files/fftw-ppc-macos.1.patch 1429 AUX fftw-ppc-macos.patch 1356 RMD160 edd7e7fc6e6fb1dfed5cda10a35b1b95eceed47b SHA1 ca5ed5a0bbf7c4d6831d32e5308585ffb6e3e5b6 SHA256 e66aa8b594bcc756404f28205d595b78fcb3209dd3c9cdc01ce8efe704426a70 MD5 7718e5a1330e574b38daecb472bffa17 files/fftw-ppc-macos.patch 1356 RMD160 edd7e7fc6e6fb1dfed5cda10a35b1b95eceed47b files/fftw-ppc-macos.patch 1356 SHA256 e66aa8b594bcc756404f28205d595b78fcb3209dd3c9cdc01ce8efe704426a70 files/fftw-ppc-macos.patch 1356 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 DIST fftw-3.0.1.tar.gz 1946361 RMD160 075bbdf5da67bb29117f9f54864db26acd971034 SHA1 e392a005dd93583f47de29ec4992687aa21bf3a2 SHA256 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1 -DIST fftw-3.1.1.tar.gz 2719997 RMD160 4236f43159a39e3bd9d34bda1b95ce82609d26b6 SHA1 4efa2482451a71ea0887997eee7ce7b168e8efea SHA256 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c DIST fftw-3.1.2.tar.gz 2736360 RMD160 13069b3582eeaa1fba1614cdca2dfbc2e45ab585 SHA1 3e4c64009ffb48123a0f30f46c1d89da7810dc67 SHA256 e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf -DIST fftw-3.1.tar.gz 2692325 RMD160 af9f8a720daa60597416ca3ed3a54b8a789a6d44 SHA1 c7bc0e2a8385503cbabec699017f33a56350db3d SHA256 e961dd3f7df9ec11cebf3a9c80752caee22a00fd149b36c7680f8da708e76bf7 -EBUILD fftw-2.1.5-r2.ebuild 4241 RMD160 938cf3b77ce31b41844e6d645488926b1c25eee9 SHA1 6f95b37bd8c2375567963867aad5031ff29395db SHA256 9b3eecde48dc3c72c1ff7c8e3535fdbabb03990be06a619773d85513041a3b67 -MD5 d091d67c05fd1bef3b480fe8b189fa42 fftw-2.1.5-r2.ebuild 4241 -RMD160 938cf3b77ce31b41844e6d645488926b1c25eee9 fftw-2.1.5-r2.ebuild 4241 -SHA256 9b3eecde48dc3c72c1ff7c8e3535fdbabb03990be06a619773d85513041a3b67 fftw-2.1.5-r2.ebuild 4241 EBUILD fftw-2.1.5-r3.ebuild 3803 RMD160 aa293282ae2a21a8f6145ee0c8c29f742cb6773e SHA1 b544757e710830725ca069a2649501b0b2eed383 SHA256 9783ce547f72052d6acaa9bc2e6f5f3573e9a0f92d4fd6e781be2b5ec28c5760 MD5 f4fc0808c1f338592c3d8cf8b16962b3 fftw-2.1.5-r3.ebuild 3803 RMD160 aa293282ae2a21a8f6145ee0c8c29f742cb6773e fftw-2.1.5-r3.ebuild 3803 SHA256 9783ce547f72052d6acaa9bc2e6f5f3573e9a0f92d4fd6e781be2b5ec28c5760 fftw-2.1.5-r3.ebuild 3803 -EBUILD fftw-3.0.1-r1.ebuild 2759 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef SHA1 f6123e5e3501c6934d7c226988fb067b13f72bf3 SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8 -MD5 4a8f8342448809b69143f66d02e7f2d2 fftw-3.0.1-r1.ebuild 2759 -RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef fftw-3.0.1-r1.ebuild 2759 -SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8 fftw-3.0.1-r1.ebuild 2759 -EBUILD fftw-3.0.1-r2.ebuild 3005 RMD160 a1345fb026140017d000bb9a7441b33f1965f7ce SHA1 820e318b3387a4584de049772dbda649811fdb35 SHA256 c3a7a181429c0f4fb848e650a5df69a5e8442486d172a8651f3651e9c01573bc -MD5 ddba46a6fd2f5b1f5e8ec13b3bbc3a04 fftw-3.0.1-r2.ebuild 3005 -RMD160 a1345fb026140017d000bb9a7441b33f1965f7ce fftw-3.0.1-r2.ebuild 3005 -SHA256 c3a7a181429c0f4fb848e650a5df69a5e8442486d172a8651f3651e9c01573bc fftw-3.0.1-r2.ebuild 3005 -EBUILD fftw-3.0.1.ebuild 2103 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 SHA1 cfb4e8bb53f91a0629b8d0ed9c02ceb2efcd449b SHA256 9c0f3b39259be3d778db1d306e8fb712684a3f1d8b3f1189bbd38cadf10707c4 -MD5 1b3f7c7f367fa0164bf31ab90e61d8f5 fftw-3.0.1.ebuild 2103 -RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 fftw-3.0.1.ebuild 2103 -SHA256 9c0f3b39259be3d778db1d306e8fb712684a3f1d8b3f1189bbd38cadf10707c4 fftw-3.0.1.ebuild 2103 -EBUILD fftw-3.1.1.ebuild 3045 RMD160 b5da61f29ad1249910cb524a3fccaeb1a2e9bed4 SHA1 0383be0c7460007f200ad1265ecb8c36c0a2afc6 SHA256 c8b76f5765e8e461749a586194e388d5c771ab2444c1cabdf90b7da57ec36bc8 -MD5 313db8f17ed0b9fe30596f0073b62f38 fftw-3.1.1.ebuild 3045 -RMD160 b5da61f29ad1249910cb524a3fccaeb1a2e9bed4 fftw-3.1.1.ebuild 3045 -SHA256 c8b76f5765e8e461749a586194e388d5c771ab2444c1cabdf90b7da57ec36bc8 fftw-3.1.1.ebuild 3045 +EBUILD fftw-3.0.1-r2.ebuild 3202 RMD160 3fb2deeaf030e9984340a5f4b3212c82a7ab3656 SHA1 3080f38fbf653993af4a8185d9c1a73402f7a591 SHA256 a95e3dd7508d3118f788cf02c6aea085d91ad82f7f6e4e8b7e5f326aa9f421af +MD5 b8067e60ee2470d8aafb2bd5da8b77ed fftw-3.0.1-r2.ebuild 3202 +RMD160 3fb2deeaf030e9984340a5f4b3212c82a7ab3656 fftw-3.0.1-r2.ebuild 3202 +SHA256 a95e3dd7508d3118f788cf02c6aea085d91ad82f7f6e4e8b7e5f326aa9f421af fftw-3.0.1-r2.ebuild 3202 EBUILD fftw-3.1.2.ebuild 2934 RMD160 56cd7ea5790886517dad691f6a7869b0f6f0ca75 SHA1 c4d13d5c7d1e5953e656541a6e29850a7a0cff2a SHA256 5d0a9b1483726c9c5755a9bd3dbf4cce03621046af7325414d5bb808c9797bc8 MD5 c061e9a10fa87d24681d92bbbf5924db fftw-3.1.2.ebuild 2934 RMD160 56cd7ea5790886517dad691f6a7869b0f6f0ca75 fftw-3.1.2.ebuild 2934 SHA256 5d0a9b1483726c9c5755a9bd3dbf4cce03621046af7325414d5bb808c9797bc8 fftw-3.1.2.ebuild 2934 -EBUILD fftw-3.1.ebuild 2151 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 SHA1 7bbf2ceb5034e7adca9bac427a91967a4689e14b SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad -MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151 -RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151 -SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151 -MISC ChangeLog 11577 RMD160 e5ae0a55353e70fafbeb5aa576a64ce6a5cd0ad7 SHA1 218d009ea5c690efc72b0c4b29158992143e7630 SHA256 9066a78c27ff84b2041ef1924910751eea3187d81fca9084f99da4d7cece36bf -MD5 4677127b054793821ec5e2cf31702c85 ChangeLog 11577 -RMD160 e5ae0a55353e70fafbeb5aa576a64ce6a5cd0ad7 ChangeLog 11577 -SHA256 9066a78c27ff84b2041ef1924910751eea3187d81fca9084f99da4d7cece36bf ChangeLog 11577 +MISC ChangeLog 11921 RMD160 11c6bc45f04a1b4ca24b250eeb73fee238f49af6 SHA1 33d7de726e59c913d11ddaba777533dbcfca4d0f SHA256 d5f2e809c2996734f9d17318a466bda803aff91f3af244546ba09a38358a51c4 +MD5 65fee4d0f7ec2f9b46c25eaecf243f42 ChangeLog 11921 +RMD160 11c6bc45f04a1b4ca24b250eeb73fee238f49af6 ChangeLog 11921 +SHA256 d5f2e809c2996734f9d17318a466bda803aff91f3af244546ba09a38358a51c4 ChangeLog 11921 MISC metadata.xml 623 RMD160 b40059457be8478f7b38eeee889f7bb852d5bc93 SHA1 c6a16ef68d3289360da4ce23b0c050c50914e85b SHA256 d6d16c5ca65ba8d7f3f951bdd129c43357a502685dd9bdc0fd60ab43257e3278 MD5 397f895dc6e131d55e424063ef2016ff metadata.xml 623 RMD160 b40059457be8478f7b38eeee889f7bb852d5bc93 metadata.xml 623 SHA256 d6d16c5ca65ba8d7f3f951bdd129c43357a502685dd9bdc0fd60ab43257e3278 metadata.xml 623 -MD5 e8cb5e91d1ddf875789f95dfbdce7059 files/digest-fftw-2.1.5-r2 235 -RMD160 a854a6665474fce2b3601a6d956ea2c63bb77376 files/digest-fftw-2.1.5-r2 235 -SHA256 b7f8db8489af7206824f9b6353bbae681a17d3cb089a42617d0cfa425e78e5c6 files/digest-fftw-2.1.5-r2 235 MD5 e8cb5e91d1ddf875789f95dfbdce7059 files/digest-fftw-2.1.5-r3 235 RMD160 a854a6665474fce2b3601a6d956ea2c63bb77376 files/digest-fftw-2.1.5-r3 235 SHA256 b7f8db8489af7206824f9b6353bbae681a17d3cb089a42617d0cfa425e78e5c6 files/digest-fftw-2.1.5-r3 235 -MD5 d79d7261a50d0b3c10659e5beacd0ab4 files/digest-fftw-3.0.1 235 -RMD160 583f42a9b329e5113a76834c8e94fd33d162faf6 files/digest-fftw-3.0.1 235 -SHA256 312aec81b01e5fc0f42721ef933f2f89347d8e3d27c07394ddbc717be7577368 files/digest-fftw-3.0.1 235 -MD5 d79d7261a50d0b3c10659e5beacd0ab4 files/digest-fftw-3.0.1-r1 235 -RMD160 583f42a9b329e5113a76834c8e94fd33d162faf6 files/digest-fftw-3.0.1-r1 235 -SHA256 312aec81b01e5fc0f42721ef933f2f89347d8e3d27c07394ddbc717be7577368 files/digest-fftw-3.0.1-r1 235 MD5 d79d7261a50d0b3c10659e5beacd0ab4 files/digest-fftw-3.0.1-r2 235 RMD160 583f42a9b329e5113a76834c8e94fd33d162faf6 files/digest-fftw-3.0.1-r2 235 SHA256 312aec81b01e5fc0f42721ef933f2f89347d8e3d27c07394ddbc717be7577368 files/digest-fftw-3.0.1-r2 235 -MD5 b6f14bee47f3ad6a9914ddecd88cff86 files/digest-fftw-3.1 229 -RMD160 2015193cc44504a587fdcbeb70e949843666a4dc files/digest-fftw-3.1 229 -SHA256 2adbf2c5de2e51f7f10d93adba3fc399c82a0e68f5229c5fbcbbb42495b9ee14 files/digest-fftw-3.1 229 -MD5 3d28f883cdd1484bb8098a14a3fb4706 files/digest-fftw-3.1.1 235 -RMD160 05e7ed5f10d5b2211c20fcddb4ef8ffab609df53 files/digest-fftw-3.1.1 235 -SHA256 5756b978bf8b840ec07b71fe2caa22919afc66a970fa69e76ed20dfa96a72b1d files/digest-fftw-3.1.1 235 MD5 e03cdf0ef064939e4df4bdbc91efc583 files/digest-fftw-3.1.2 235 RMD160 559ef1b1533981db0a1b926b8b689b3589a7fe2a files/digest-fftw-3.1.2 235 SHA256 7aeabf836fd80094bd20daf14a0ca5778d6416887fc3f7a67b849643d12de0a1 files/digest-fftw-3.1.2 235 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFGNh0P1ycZbhPLE2ARAv7hAKCDVk75cbk7Pmo91O3T7XY1UBlg0wCeN+A1 -1K9OLaF0V4+N0jK5yNbQro4= -=arZk +iD8DBQFGOLYx1ycZbhPLE2ARAlH2AJ9C6VvesMcCu4MxrpGqrNmmlamyTACdH0Nk +fHdvfvH0h3I1sO9HSihCRxg= +=QK0m -----END PGP SIGNATURE----- diff --git a/sci-libs/fftw/fftw-2.1.5-r2.ebuild b/sci-libs/fftw/fftw-2.1.5-r2.ebuild deleted file mode 100644 index 39b763fba08b..000000000000 --- a/sci-libs/fftw/fftw-2.1.5-r2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r2.ebuild,v 1.4 2007/04/27 04:09:10 jer Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit flag-o-matic multilib libtool autotools - -IUSE="mpi" - -DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)" -SRC_URI="http://www.fftw.org/${P}.tar.gz" -HOMEPAGE="http://www.fftw.org" - -DEPEND="mpi? ( >=sys-cluster/lam-mpi-6.5.6 )" -SLOT="2.1" -LICENSE="GPL-2" - -KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" - -pkg_setup() { - #this one is reported to cause trouble on pentium4 m series - filter-mfpmath "sse" - - #here I need (surprise) to increase optimization: - #--enable-i386-hacks requires -fomit-frame-pointer to work properly - if [ "${ARCH}" != "amd64" ]; then - is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer" - fi - - einfo "" - einfo "This ebuild installs double and single precision versions of library" - einfo "This involves some name mangling, as supported by package and required" - einfo "by some apps that use it." - einfo "By default, the symlinks to non-mangled names will be created off" - einfo "double-precision version. In order to symlink to single-precision use" - einfo "SINGLE=yes emerge fftw" - einfo "" -} - -src_unpack() { - #doc suggests installing single and double precision versions via separate compilations - #will do in two separate source trees - #since some sed'ing is done during the build (?if --enable-type-prefix is set?) - - unpack "${P}.tar.gz" - cd "${S}" - epatch "${FILESDIR}/${P}-as-needed.patch" - eautoreconf - - cd "${WORKDIR}" - cp -R ${P} ${P}-double - mv ${P} ${P}-single -} - - -src_compile() { - local myconf="" - use mpi && myconf="${myconf} --enable-mpi" - - if [ "${ARCH}" == "amd64" ]; then - myconf="${myconf} --disable-i386-hacks" - else - myconf="${myconf} --enable-i386-hacks" - fi - - #mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option - #it might be needed if it is decided that lam is an optional dependence - - cd "${S}-single" - econf \ - --enable-shared \ - --enable-threads \ - --enable-type-prefix \ - --enable-float \ - --enable-vec-recurse \ - ${myconf} || die "./configure failed" - emake || die - - #the only difference here is no --enable-float - cd "${S}-double" - econf \ - --enable-shared \ - --enable-threads \ - --enable-type-prefix \ - --enable-vec-recurse \ - ${myconf} || die "./configure failed" - emake || die -} - -src_install () { - #both builds are installed in the same place - #libs are distinguished by preffix (s or d), see docs for details - cd "${S}-single" - - make DESTDIR=${D} install || die - - cd "${S}-double" - - # fix info file - local infofile - for infofile in doc/fftw*info*; do - echo "INFO-DIR-SECTION Libraries" >>${infofile} - echo "START-INFO-DIR-ENTRY" >>${infofile} - echo "* fftw: (fftw). C subroutine library for computing the Discrete Fourier Transform (DFT)" >>${infofile} - echo "END-INFO-DIR-ENTRY" >>${infofile} - done - make DESTDIR=${D} install || die - - # Install documentation. - cd "${S}-single" - - dodoc AUTHORS ChangeLog COPYING INSTALL NEWS TODO - dohtml doc/fftw*.html - - if [ "$SINGLE" = "yes" ]; then - cd ${D}usr/include - dosym sfftw.h /usr/include/fftw.h - dosym srfftw.h /usr/include/rfftw.h - dosym sfftw_threads.h /usr/include/fftw_threads.h - dosym srfftw_threads.h /usr/include/rfftw_threads.h - cd ${D}usr/$(get_libdir) - dosym libsfftw.so /usr/$(get_libdir)/libfftw.so - dosym libsrfftw.so /usr/$(get_libdir)/librfftw.so - dosym libsfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so - dosym libsrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so - else - cd ${D}usr/include - dosym dfftw.h /usr/include/fftw.h - dosym drfftw.h /usr/include/rfftw.h - dosym dfftw_threads.h /usr/include/fftw_threads.h - dosym drfftw_threads.h /usr/include/rfftw_threads.h - cd ${D}usr/$(get_libdir) - dosym libdfftw.so /usr/$(get_libdir)/libfftw.so - dosym libdrfftw.so /usr/$(get_libdir)/librfftw.so - dosym libdfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so - dosym libdrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so - fi - - cd "${S}-single/fortran" - insinto usr/include - doins fftw_f77.i -} diff --git a/sci-libs/fftw/fftw-3.0.1-r1.ebuild b/sci-libs/fftw/fftw-3.0.1-r1.ebuild deleted file mode 100644 index ff1807cd0fd1..000000000000 --- a/sci-libs/fftw/fftw-3.0.1-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1-r1.ebuild,v 1.8 2005/07/17 21:55:00 hardave Exp $ - -inherit flag-o-matic eutils toolchain-funcs - -DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="~alpha amd64 hppa ia64 ~mips ~ppc ~ppc-macos ppc64 sparc ~x86" -IUSE="3dnow altivec mpi sse sse2" - -DEPEND="virtual/libc" - -src_unpack() { - unpack "${P}.tar.gz" - cd "${WORKDIR}" - use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch - mv ${P} ${P}-single - - unpack "${P}.tar.gz" - cd "${WORKDIR}" - use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch - mv ${P} ${P}-double -} - -src_compile() { - #-fpmath=xx is reported to cause trouble on pentium4 m series - #(for 3.0.x: this sort of thing should be handled by the --enable-sse - #style configure flags. these are set below using the use variables, - #but under gcc-3.2.x, sse2 seems to cause trouble.) - filter-mfpmath - - # in gcc 3.2.3 at least, using sse or sse2 causes trouble with -O3 - # according to the docs, -O0 can cause trouble too! So pending further - # testing, ... - if use sse; then - filter-flags -O3 -O1 -O -Os - append-flags -O2 - fi - - local myconf="" - local myconfsingle="" - local myconfdouble="" - - use mpi && myconf="${myconf} --enable-mpi" - #mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option - #it might be needed if it is decided that lam is an optional dependence - - if use sse2; then - myconfsingle="$myconfsingle --enable-sse" - myconfdouble="$myconfdouble --enable-sse2" - elif use sse; then - myconfsingle="$myconfsingle --enable-sse" - elif use 3dnow; then - myconfsingle="$myconfsingle --enable-k7" - fi - - # Altivec-support in fftw is currently broken - # with gcc 3.4 - if [ "`gcc-version`" != "3.4" ]; then - myconfsingle="$myconfsingle `use_enable altivec`" - fi - - cd "${S}-single" - econf \ - --enable-shared \ - --enable-threads \ - --enable-float \ - ${myconf} ${myconfsingle} || die "./configure failed" - emake || die - - #the only difference here is no --enable-float - cd "${S}-double" - econf \ - --enable-shared \ - --enable-threads \ - ${myconf} ${myconfdouble} || die "./configure failed" - emake || die -} - -src_install () { - #both builds are installed in the same place - #libs have distinuguished names; include files, docs etc. identical. - cd "${S}-single" - make DESTDIR=${D} install || die - - cd "${S}-double" - make DESTDIR=${D} install || die - - # Install documentation. - cd "${S}-single" - - dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS - - cd doc/html - dohtml -r . -} diff --git a/sci-libs/fftw/fftw-3.0.1-r2.ebuild b/sci-libs/fftw/fftw-3.0.1-r2.ebuild index c02226bfa5ad..21141456d1d9 100644 --- a/sci-libs/fftw/fftw-3.0.1-r2.ebuild +++ b/sci-libs/fftw/fftw-3.0.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1-r2.ebuild,v 1.14 2007/01/04 18:17:10 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1-r2.ebuild,v 1.15 2007/05/02 16:01:42 bicatali Exp $ WANT_AUTOMAKE="1.9" WANT_AUTOCONF="latest" @@ -35,6 +35,7 @@ src_unpack() { cd "${WORKDIR}" use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch + use amd64 && epatch ${FILESDIR}/${P}-amd64.patch mv ${P} ${P}-single cp -pPR ${P}-single ${P}-double } @@ -94,6 +95,13 @@ src_compile() { emake || die } +src_test() { + cd "${S}-single" + emake check || die "emake check single failed" + cd "${S}-double" + emake check || die "emake check double failed" +} + src_install () { #both builds are installed in the same place #libs have distinuguished names; include files, docs etc. identical. diff --git a/sci-libs/fftw/fftw-3.0.1.ebuild b/sci-libs/fftw/fftw-3.0.1.ebuild deleted file mode 100644 index 797235d37c31..000000000000 --- a/sci-libs/fftw/fftw-3.0.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1.ebuild,v 1.4 2006/02/26 23:27:19 markusle Exp $ - -IUSE="3dnow sse mpi" - -inherit flag-o-matic - -DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)" -SRC_URI="http://www.fftw.org/${P}.tar.gz" -HOMEPAGE="http://www.fftw.org" - -SLOT="3.0" -LICENSE="GPL-2" -DEPEND="virtual/libc" - -KEYWORDS="x86 ppc sparc alpha ~ia64 amd64" - -src_unpack() { - unpack "${P}.tar.gz" - cd "${WORKDIR}" - mv ${P} ${P}-single - - unpack "${P}.tar.gz" - cd "${WORKDIR}" - mv ${P} ${P}-double -} - - -src_compile() { - local myconf="" - local myconfsingle="" - local myconfdouble="" - - # in gcc 3.2.3 at least, using sse or sse2 causes trouble with -O3 - # according to the docs, -O0 can cause trouble too! So pending further - # testing, ... - - if use sse; then - filter-flags -O3 -O1 -O -Os - append-flags -O2 - fi - - use mpi && myconf="${myconf} --enable-mpi" - #mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option - #it might be needed if it is decided that lam is an optional dependence - - if use sse; then - myconfsingle="$myconfsingle --enable-sse" - myconfdouble="$myconfdouble --enable-sse2" - elif use 3dnow; then - myconfsingle="$myconfsingle --enable-3dnow" - fi - - cd "${S}-single" - econf \ - --enable-shared \ - --enable-threads \ - --enable-float \ - ${myconf} ${myconfsingle} || die "./configure failed" - emake || die - - #the only difference here is no --enable-float - cd "${S}-double" - econf \ - --enable-shared \ - --enable-threads \ - ${myconf} ${myconfdouble} || die "./configure failed" - emake || die -} - -src_install () { - #both builds are installed in the same place - #libs have distinuguished names; include files, docs etc. identical. - cd "${S}-single" - make DESTDIR=${D} install || die - - cd "${S}-double" - make DESTDIR=${D} install || die - - # Install documentation. - cd "${S}-single" - - dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO - dodoc COPYRIGHT CONVENTIONS - - cd doc/html - dohtml -r . -} diff --git a/sci-libs/fftw/fftw-3.1.1.ebuild b/sci-libs/fftw/fftw-3.1.1.ebuild deleted file mode 100644 index 5f51ec5ce5eb..000000000000 --- a/sci-libs/fftw/fftw-3.1.1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.1.ebuild,v 1.7 2006/06/28 10:31:39 robbat2 Exp $ - -inherit flag-o-matic eutils toolchain-funcs autotools - -DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" -IUSE="altivec sse sse2 test" - -DEPEND="test? ( dev-lang/perl )" - -src_unpack() { - unpack ${A} - cd "${S}" - - if [[ "${ARCH}" == "ppc-macos" ]];then - epatch "${FILESDIR}"/${PN}-ppc-macos.patch - fi - - # fix info file - sed -e 's/Texinfo documentation system/Libraries/' \ - -i doc/fftw3.info || die "failed to fix info file" - - # fix altivec compilation problems (bug #129304) - epatch "${FILESDIR}"/${PN}-altivec-headers.patch - eautoconf - - cd "${WORKDIR}" - mv ${P} ${P}-single - cp -pPR ${P}-single ${P}-double - cp -pPR ${P}-single ${P}-longdouble -} - -src_compile() { - # filter -Os according to docs - replace-flags -Os -O2 - - local myconfcommon="--enable-shared --enable-threads" - local myconfsingle="" - local myconfdouble="" - local myconflongdouble="" - - if use sse2; then - myconfsingle="$myconfsingle --enable-sse" - myconfdouble="$myconfdouble --enable-sse2" - elif use sse; then - myconfsingle="$myconfsingle --enable-sse" - fi - # altivec only helps floats, not doubles - if use altivec; then - myconfsingle="$myconfsingle --enable-altivec" - fi - - cd "${S}-single" - econf \ - ${myconfcommon} \ - --enable-float \ - ${myconfsingle} || \ - die "./configure in single failed" - emake || die - - #the only difference here is no --enable-float - cd "${S}-double" - econf \ - ${myconfcommon} \ - ${myconfdouble} || \ - die "./configure in double failed" - emake || die - - #the only difference here is --enable-long-double - cd "${S}-longdouble" - econf \ - ${myconfcommon} \ - --enable-long-double \ - ${myconflongdouble} || \ - die "./configure in long double failed" - emake || die -} - -src_install () { - #all builds are installed in the same place - #libs have distinuguished names; include files, docs etc. identical. - cd "${S}-single" - emake DESTDIR="${D}" install || die - - cd "${S}-double" - emake DESTDIR="${D}" install || die - - cd "${S}-longdouble" - emake DESTDIR="${D}" install || die - - # Install documentation. - cd "${S}-single" - - dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS - - cd doc/html - dohtml -r . -} - -src_test () { - # We want this to be a reasonably quick test, but that is still hard... - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine" - # Do not increase the number of threads, it will not help your performance - local testbase="perl check.pl --nthreads=1 --estimate" - for d in single double longdouble; do - cd "${S}-${d}"/tests - for p in 0 1 2; do - n="${d/longdouble/long double} / ${p}-D" - einfo "Testing $n" - ${testbase} -${p}d || die "Failure: $n" - done - done -} diff --git a/sci-libs/fftw/fftw-3.1.ebuild b/sci-libs/fftw/fftw-3.1.ebuild deleted file mode 100644 index b057244b66d7..000000000000 --- a/sci-libs/fftw/fftw-3.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.ebuild,v 1.2 2006/03/07 22:01:43 markusle Exp $ - -inherit flag-o-matic eutils toolchain-funcs - -DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)" -HOMEPAGE="http://www.fftw.org/" -SRC_URI="http://www.fftw.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" -IUSE="3dnow altivec sse sse2" - -DEPEND="" - -src_unpack() { - unpack "${P}.tar.gz" - cd "${S}" - cd "${WORKDIR}" - use ppc-macos && epatch "${FILESDIR}"/${PN}-ppc-macos.patch - mv ${P} ${P}-single - cp -pPR ${P}-single ${P}-double -} - -src_compile() { - # filter -Os according to docs - replace-flags -Os -O2 - - local myconfsingle="" - local myconfdouble="" - - if use sse2; then - myconfsingle="$myconfsingle --enable-sse" - myconfdouble="$myconfdouble --enable-sse2" - elif use sse; then - myconfsingle="$myconfsingle --enable-sse" - elif use 3dnow; then - myconfsingle="$myconfsingle --enable-k7" - fi - - # disable building of shared libs for k7 (c.f. bug #125218) - if ! use 3dnow; then - myconfsingle="$myconfsingle --enable-shared" - myconfdouble="$myconfdouble --enable-shared" - fi - - - # Altivec-support in fftw is currently broken - # with gcc 3.4 - if [ "`gcc-version`" != "3.4" ]; then - myconfsingle="$myconfsingle `use_enable altivec`" - fi - - cd "${S}-single" - econf \ - --enable-threads \ - --enable-float \ - ${myconfsingle} || \ - die "./configure in single failed" - emake || die - - #the only difference here is no --enable-float - cd "${S}-double" - econf \ - --enable-threads \ - ${myconfdouble} || \ - die "./configure in double failed" - emake || die -} - -src_install () { - #both builds are installed in the same place - #libs have distinuguished names; include files, docs etc. identical. - cd "${S}-single" - make DESTDIR=${D} install || die - - cd "${S}-double" - make DESTDIR=${D} install || die - - # Install documentation. - cd "${S}-single" - - dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS - - cd doc/html - dohtml -r . -} diff --git a/sci-libs/fftw/files/digest-fftw-2.1.5-r2 b/sci-libs/fftw/files/digest-fftw-2.1.5-r2 deleted file mode 100644 index 949efaeda653..000000000000 --- a/sci-libs/fftw/files/digest-fftw-2.1.5-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz 1256888 -RMD160 723308722d76c12710db6473979adf8d086b0909 fftw-2.1.5.tar.gz 1256888 -SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 fftw-2.1.5.tar.gz 1256888 diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1 b/sci-libs/fftw/files/digest-fftw-3.0.1 deleted file mode 100644 index a837c11d9572..000000000000 --- a/sci-libs/fftw/files/digest-fftw-3.0.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361 -RMD160 075bbdf5da67bb29117f9f54864db26acd971034 fftw-3.0.1.tar.gz 1946361 -SHA256 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1 fftw-3.0.1.tar.gz 1946361 diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1-r1 b/sci-libs/fftw/files/digest-fftw-3.0.1-r1 deleted file mode 100644 index a837c11d9572..000000000000 --- a/sci-libs/fftw/files/digest-fftw-3.0.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361 -RMD160 075bbdf5da67bb29117f9f54864db26acd971034 fftw-3.0.1.tar.gz 1946361 -SHA256 14f2cf295eed74369c622db005fe34f57e74a5efbd3fb66144b8d6d284ce0cb1 fftw-3.0.1.tar.gz 1946361 diff --git a/sci-libs/fftw/files/digest-fftw-3.1 b/sci-libs/fftw/files/digest-fftw-3.1 deleted file mode 100644 index 5fec32e2df5b..000000000000 --- a/sci-libs/fftw/files/digest-fftw-3.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 911515569a8abdc7dbb207d53f34e60b fftw-3.1.tar.gz 2692325 -RMD160 af9f8a720daa60597416ca3ed3a54b8a789a6d44 fftw-3.1.tar.gz 2692325 -SHA256 e961dd3f7df9ec11cebf3a9c80752caee22a00fd149b36c7680f8da708e76bf7 fftw-3.1.tar.gz 2692325 diff --git a/sci-libs/fftw/files/digest-fftw-3.1.1 b/sci-libs/fftw/files/digest-fftw-3.1.1 deleted file mode 100644 index 1889f2e3babf..000000000000 --- a/sci-libs/fftw/files/digest-fftw-3.1.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b35813b88a046e4e74a603017794ddcd fftw-3.1.1.tar.gz 2719997 -RMD160 4236f43159a39e3bd9d34bda1b95ce82609d26b6 fftw-3.1.1.tar.gz 2719997 -SHA256 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c fftw-3.1.1.tar.gz 2719997 diff --git a/sci-libs/fftw/files/fftw-3.0.1-amd64.patch b/sci-libs/fftw/files/fftw-3.0.1-amd64.patch new file mode 100644 index 000000000000..d5df07581a92 --- /dev/null +++ b/sci-libs/fftw/files/fftw-3.0.1-amd64.patch @@ -0,0 +1,66 @@ +diff -uarN fftw-3.0.1.old/dft/k7/k7.c fftw-3.0.1/dft/k7/k7.c +--- fftw-3.0.1.old/dft/k7/k7.c 2007-04-18 10:05:40.000000000 +0400 ++++ fftw-3.0.1/dft/k7/k7.c 2007-04-18 10:08:57.000000000 +0400 +@@ -28,7 +28,7 @@ + { + int eax, ecx, edx; + +- __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx" ++ __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx" + : "=a" (eax), "=c" (ecx), "=d" (edx) + : "a" (op)); + return edx; +@@ -38,7 +38,7 @@ + { + int eax, ecx, edx; + +- __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx" ++ __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx" + : "=a" (eax), "=c" (ecx), "=d" (edx) + : "a" (op)); + return eax; +diff -uarN fftw-3.0.1.old/simd/3dnow.c fftw-3.0.1/simd/3dnow.c +--- fftw-3.0.1.old/simd/3dnow.c 2007-04-18 10:05:41.000000000 +0400 ++++ fftw-3.0.1/simd/3dnow.c 2007-04-18 10:08:31.000000000 +0400 +@@ -29,7 +29,7 @@ + { + int eax, ecx, edx; + +- __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx" ++ __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx" + : "=a" (eax), "=c" (ecx), "=d" (edx) + : "a" (op)); + return edx; +@@ -39,7 +39,7 @@ + { + int eax, ecx, edx; + +- __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx" ++ __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx" + : "=a" (eax), "=c" (ecx), "=d" (edx) + : "a" (op)); + return eax; +diff -uarN fftw-3.0.1.old/simd/sse2.c fftw-3.0.1/simd/sse2.c +--- fftw-3.0.1.old/simd/sse2.c 2007-04-18 10:05:41.000000000 +0400 ++++ fftw-3.0.1/simd/sse2.c 2007-04-18 10:08:14.000000000 +0400 +@@ -43,7 +43,7 @@ + #else + int eax, ecx, edx; + +- __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx" ++ __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx" + : "=a" (eax), "=c" (ecx), "=d" (edx) + : "a" (op)); + return edx; +diff -uarN fftw-3.0.1.old/simd/sse.c fftw-3.0.1/simd/sse.c +--- fftw-3.0.1.old/simd/sse.c 2007-04-18 10:05:41.000000000 +0400 ++++ fftw-3.0.1/simd/sse.c 2007-04-18 10:08:04.000000000 +0400 +@@ -43,7 +43,7 @@ + #else + int eax, ecx, edx; + +- __asm__("push %%ebx\n\tcpuid\n\tpop %%ebx" ++ __asm__("push %%rbx\n\tcpuid\n\tpop %%rbx" + : "=a" (eax), "=c" (ecx), "=d" (edx) + : "a" (op)); + return edx; diff --git a/sci-libs/fftw/files/fftw-ppc-macos.1.patch b/sci-libs/fftw/files/fftw-ppc-macos.1.patch deleted file mode 100644 index bb068bdec222..000000000000 --- a/sci-libs/fftw/files/fftw-ppc-macos.1.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur fftw-3.1/tests/Makefile.in fftw-3.1-new/tests/Makefile.in ---- fftw-3.1/tests/Makefile.in 2006-01-28 00:19:55.000000000 +0000 -+++ fftw-3.1-new/tests/Makefile.in 2006-02-11 05:39:29.000000000 +0000 -@@ -233,9 +233,9 @@ - @COMBINED_THREADS_FALSE@@THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la - @THREADS_FALSE@LIBFFTWTHREADS = - bench_SOURCES = bench.c hook.c --bench_LDADD = $(LIBFFTWTHREADS) \ -+bench_LDADD = $(top_builddir)/libbench2/libbench2.a $(LIBFFTWTHREADS) \ - $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ --$(top_builddir)/libbench2/libbench2.a $(THREADLIBS) -+$(THREADLIBS) - - all: all-am - -diff -Naur fftw-3.1/tools/Makefile.in fftw-3.1-new/tools/Makefile.in ---- fftw-3.1/tools/Makefile.in 2006-01-28 00:19:56.000000000 +0000 -+++ fftw-3.1-new/tools/Makefile.in 2006-02-11 05:40:41.000000000 +0000 -@@ -246,9 +246,9 @@ - @COMBINED_THREADS_FALSE@@THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la - @THREADS_FALSE@LIBFFTWTHREADS = - fftw@PREC_SUFFIX@_wisdom_SOURCES = fftw-wisdom.c --fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench.o \ -+fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench.o $(top_builddir)/libbench2/libbench2.a \ - $(LIBFFTWTHREADS) $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ --$(top_builddir)/libbench2/libbench2.a $(THREADLIBS) -+$(THREADLIBS) - - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am -- 2.26.2