From: Michał Górny Date: Thu, 29 Jan 2015 22:57:04 +0000 (+0000) Subject: Convert to CPU_FLAGS_X86. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4dc676309838ab6029c5d02ec218a153edf47c17;p=gentoo.git Convert to CPU_FLAGS_X86. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 2f9191d0f920..1b255f256630 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/fftw -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.161 2014/09/02 15:09:29 dev-zero Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.162 2015/01/29 22:57:00 mgorny Exp $ + + 29 Jan 2015; Michał Górny fftw-3.3.3-r2.ebuild, + fftw-3.3.4.ebuild, metadata.xml: + Convert to CPU_FLAGS_X86. 02 Sep 2014; Tiziano Müller fftw-3.3.4.ebuild: Disable parallel ABI-install (bug #521044). diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 84c18852d2ae..d664ba4459ce 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -10,26 +10,26 @@ DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c7 DIST fftw-3.3.3.tar.gz 3920661 SHA256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3 SHA512 1d88b6376ba8c15cceafd3381de1d181a974b921b72b31dd89c297e5771e8d665aa3c121ef2504a70e7b0bb562b1e0612ac2a02121c412d27df06c4d687507c4 WHIRLPOOL b410cb4d854988f9a57f08344d9207ece4ebf218ec6fa605036235e472bef91f5037d852793fa6a7bc0f8a6a7081dc1e71b25b15ab1259e299bb95affca40d3b DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938 EBUILD fftw-2.1.5-r8.ebuild 3987 SHA256 549c5f70223704a7859648fd67075cee06a6e0028535e2d1a724e9600b70965d SHA512 373c4bad0587e245a26c3da95b52a51f15e3e70d3260d50fd84c528ae196d4062cd0660fb6123dafd6c173836a1384c1f23b2fe7c5bf830474cd35e9d76dd889 WHIRLPOOL bca2d52dc4f7058f84d253b195d8b2a187bd7541fdcefc07719e895731d503596083edb9e25d61c1e9ae2907800f1b67ae97114418260d1b59843f7f7a5253e5 -EBUILD fftw-3.3.3-r2.ebuild 3904 SHA256 17cf3c43681d1db09388800e51fe0e46a696563ceee92ecb77638bdfe27bea16 SHA512 c8a4fe2249d4fd7e849659ce016924d5c4746d5a74e8a7ae97ab6d7d1a2e3b2f517336ad4cfa00b382652ed16906ac9252d11484f5c402dab398a86ac401a73e WHIRLPOOL 86f5919fcc0e692eb0cbca5e72f26cd5216d5b8d54f6dbfbab8d52608c39679aa450323de69dec5895835ed21c39494beeeac806e8ef07c1223615bd9dd02e42 -EBUILD fftw-3.3.4.ebuild 4558 SHA256 f7e862b79fca2cc8b4b390f7f8a101361d9feb28af3a5fa2d13883a9cac2eb0a SHA512 4b28b915ada5cef6f4dd0db5f551d825c693d165e15adfb2b090e7dcf85f19d51f877d8f272b109ed0a3ab613c4bdb8ff0da833265d579b47c82be5c879b784c WHIRLPOOL a589e5460c9346c17d518a5de2102e5767b1d7ba06af3f47975d57a77c69d83fcc718b8c4d27283cf64e61b04b8439da5e27a401566d2bd2f8244635648fea14 -MISC ChangeLog 28268 SHA256 36af12d859f41427448f47cdfcc7172875e0202be18368cffb9a4567a76bcffc SHA512 828b51e8f1c363e35c54bfe598160321acf5a17d91d85a516f9d3f7ec9f73b9e98e380f5bc22a389f0b122e106c044bbe51f21be40781dc155d41f87862c5e07 WHIRLPOOL df204c73202d3d20b0fef52e34b026be7235bdce92360a0ecb95497310d5401211a668ba14fb7f43ff2c204534a74c29f40b0dacf86f6415783a68ecb6153c86 -MISC metadata.xml 1153 SHA256 4098cfa7c224af2bafc5dac8c1834e4f53b4c992f2dcfe20ce494b0ecbc3caf4 SHA512 e1f7f672f1f185781fbe4135a787b03800199caea1ad8e9287182a0605401db8f61de96372a106d92f608900aa158ebaa96b3256d6d7566fdd5f183f0be91b88 WHIRLPOOL 50140233feb932045fc2bf97d3a254628fe6afff32c3c30ddb524d03442ba84aaf4f10e5e3868ba416f8928f81718901ad68b2ca45db442467ab26942a74196f +EBUILD fftw-3.3.3-r2.ebuild 4106 SHA256 4fbc3481acb7bc10fc610288c9bdc64504eddeb95a70583a72133e935fa9cff5 SHA512 b76365c873097012e3bbe2bd16e1313f6a67cb2745b026009bad1ce6ab89ec30cb6e8403097236378e7463f153e95422ec3e08d46611c324bb6aa47143c7ab0f WHIRLPOOL bdf40f3c647c6b21a9d07b4ae2e88473b09791df3edf74c2690bcc869cb2a6b8ab5cfc0c92364f9761997f79c8eda1882f84e10aeb0d5d9b4846ccc923db31cf +EBUILD fftw-3.3.4.ebuild 4755 SHA256 b5dfc6cf4feb01b7f12f61fbc5edaf16a85408dbdaa87bb2f0e06a2732a2a235 SHA512 bc1452e53e7ea3055c76c742d7921601828c309ae3ee521631383b524b6a63ac30ce1d515bf7897cd3180c322329355ef3ba8e3f1be871d2491344772f5df325 WHIRLPOOL c510ba741b834477cecdec9639b7e80c16054087e88a86fc7bd498530d960ecf5500b2a12feda5f05a29b4111f82d08e3c4f1d23399976e8ea3145c4020e11b8 +MISC ChangeLog 28402 SHA256 d8ddedd1faca71b5f91964b1696e468fec5b9ff2af9d085177518b51407d2cf8 SHA512 e72e8b1e121c60616e9fe1a811a4b3b1a9e41beee16166e529e08198100b88b8fa42a0574963137d3e481702d38f69b3c3a5937f02e223e51edac2126e16ff64 WHIRLPOOL 904d26083cfd9d53b6b559256939f773a97d5b3daa70a11f22f2ebabafffd5342ed80bfd1460b3e67794306c0fc68084703495cc6592edb584813e55ae7c4357 +MISC metadata.xml 987 SHA256 6c441e0acecaa0c63e03c5f65c22d39c668a48004e31b085b7b4968e9f3750f0 SHA512 58629ec0239e32d90b2818f4e6ec5349f00f4339bd8197f341506d88a71a8504e1e110f23a60a14087dd0325d1a69c6a93f09d46ed47ef7d3859a4b69dabb7d8 WHIRLPOOL 309500ea9d3b47fa92005cff7414aa21b2f7e97887f400fec49ccc56e62399b7a7d343b5469ca1cc3474222cfa25a24ed99edf4491f862a19a0cb6ada7eb16d7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCABmBQJUBd2qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx -QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9phAQANBvGp389tRbiqbwi7tZLV6z -1WQmZXnBG4jHpaCoVlSvadhXNUEU63GSSsXBSnYCFPqKoeJGY76MPAyuHBtdotHt -TB9bkBZICEGFoeWc0taO/Mgg+ti7DLYHa2y9YLE3mwXdVVY3shIeu0dosqCj8OMI -D4asCniUvvhoDeezan2N95gr0fn4etHZm4FSET2XSmwv3512FYl622AWjHKlL2BK -2x/PICrdrBSptKv29D+ow9eGQ3edw2Z7eeerEdB2giOQrS618C4JFfEyrJNXSHXF -Sdhkp9dQ4xhCnYIRMN8G4AkGDspHHvWF13AQS5IcqQIZ7LrKWKoiX5Pv/NqnEiZb -me+b/ykp/pf4aUOMhXAKLmsi/smgAMR/Z1FFiaoo2NA3eMjlj3OYzhjt6VFuYFFB -abqMCoOk9vESoeeZ7Ml+imv6izcn5TKQUnICz59Pur6oGzvvywYFcOkkdHj8ryka -xn3JJH9wPyHWeSr8ZH6FHbRtmsCD9BtwBfECZ7FGULHhg5uU9COvxY0w20/jkXO6 -vYj+V+htDFD1xlo23EFWUkRedR3pkXW4uC/LUHWjEVBEXD6tHpplAMlbkUG2x5eQ -21aunZfZ3rKJ8Q7SAr8RzypAeP1XdOdoqtki4WXUEYTmEQkE+2bhu2Sgh/5XbWp0 -MFRXdXFRwPFZzmPujMcx -=EtHM +iQJ8BAEBCABmBQJUyrrAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOywAQALaqh96eB+nL84oXy+BGOiaV +/2Yuu1E7Mk67WFl2aA2zAgZBi3p5BIVzriECncQn/yU/NtLjbkmSyAsPwy98d9Js +8SgUncLKn/HtwHISZmyZ8K2Q61Xlz0Ex9TgRAFlh8pabM0/l6qMpPdrwC3pEA3Tv +KsuLtgrd/O2R3tnyUjqfTp1HLoB5vnTyqeUttqky5xSD65wCu04zOI4QTHCjGvkW +3iy1MbjghVtFi9d5AZJqGuO4VNGXs0HSA4BWqgXs5joMt2gBrzqXfZQ0EWW5T378 +YlgzpqDkPT88W6zK88HR3VOXGnkaeAHDrpFOu4RTXHHuXaoEnyxQlVi9O/D+WVNN +ctbNVhHkGEFikHzJPVTNs1w3I2igP9euizC6RxVn9Mf5HtTnFs77rB+zrdBoQiyt +4rFjDtACm4qWvf4HoYBJU6q1e+j6PxVsR6DSBwnEayWcPl/BgCmVSBJGh7Sm2mC7 +uoCDJ9juy8bofUWMkIlMrJvVcUYWpA/1a0jJzo1gSTDyRQ/T8gerrCxwNSdlzYFX +0kNnnJeVeW8pDCGpmjExpBbQARfB7GCowyrCuQGCrjJ2EnhxlowQCtlo+2UIwB8x +mBvD9+ZDFdxf+4p0Xl2axTIzDuvRFaMfHNZVEvdGgh2Syz6CY8L0UC+vz4Jo9kGR +xLCD6v+BdskqAqkxccj5 +=9aYZ -----END PGP SIGNATURE----- diff --git a/sci-libs/fftw/fftw-3.3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3.3-r2.ebuild index 47f57c607d30..0e62cfacff03 100644 --- a/sci-libs/fftw/fftw-3.3.3-r2.ebuild +++ b/sci-libs/fftw/fftw-3.3.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.12 2013/09/26 17:32:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.13 2015/01/29 22:57:00 mgorny Exp $ EAPI=5 @@ -16,7 +16,7 @@ SRC_URI="http://www.fftw.org/${P}.tar.gz" LICENSE="GPL-2" SLOT="3.0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus" +IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus" # there is no abi_x86_32 port of virtual/mpi right now REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" @@ -70,7 +70,7 @@ src_configure() { local x=${MULTIBUILD_VARIANT} myeconfargs=( - $(use_enable fma) + $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) $(use_enable fortran) $(use_enable zbus mips-zbus-timer) $(use_enable threads) @@ -81,15 +81,15 @@ src_configure() { myeconfargs+=( --enable-single $(use_enable altivec) - $(use_enable avx) - $(use_enable sse) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_sse sse) $(use_enable mpi) $(use_enable neon) ) elif [[ $x == double ]]; then myeconfargs+=( - $(use_enable avx) - $(use_enable sse2) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_sse2 sse2) $(use_enable mpi) ) elif [[ $x == longdouble ]]; then diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild index a965342a5c90..12ba7a8171b5 100644 --- a/sci-libs/fftw/fftw-3.3.4.ebuild +++ b/sci-libs/fftw/fftw-3.3.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.5 2014/09/02 15:09:29 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.6 2015/01/29 22:57:00 mgorny Exp $ EAPI=5 @@ -23,7 +23,7 @@ fi LICENSE="GPL-2" SLOT="3.0/3" -IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus" +IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus" RDEPEND=" mpi? ( virtual/mpi ) @@ -88,7 +88,7 @@ src_configure() { fi local myeconfargs=( - $(use_enable fma) + $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma) $(use_enable fortran) $(use_enable zbus mips-zbus-timer) $(use_enable threads) @@ -99,15 +99,15 @@ src_configure() { myeconfargs+=( --enable-single $(use_enable altivec) - $(use_enable avx) - $(use_enable sse) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_sse sse) ${enable_mpi} $(use_enable neon) ) elif [[ $x == double ]]; then myeconfargs+=( - $(use_enable avx) - $(use_enable sse2) + $(use_enable cpu_flags_x86_avx avx) + $(use_enable cpu_flags_x86_sse2 sse2) ${enable_mpi} ) elif [[ $x == longdouble ]]; then diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml index c7ae6003bbab..5221b542c560 100644 --- a/sci-libs/fftw/metadata.xml +++ b/sci-libs/fftw/metadata.xml @@ -12,10 +12,8 @@ publicly available FFT software. - Adds support for Advanced Vector Extensions Link default library to single precision instead of double (symlinks only and fftw-2.1) - Use the Fused Multiply Add instruction set (fma3/fma4 either one) Build quadruple precision lib Adds support for ZBus cycle-counter of mips