diff options
author | Justin Lecher <jlec@gentoo.org> | 2011-01-15 13:32:50 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2011-01-15 13:32:50 +0000 |
commit | bd52ab926c43f46912736fa23985c28ea20e0111 (patch) | |
tree | 0a3b722bef64f1526c59888653ade8f8b2582ff7 /sci-libs | |
parent | ppc64 stable wrt #348509 (diff) | |
download | historical-bd52ab926c43f46912736fa23985c28ea20e0111.tar.gz historical-bd52ab926c43f46912736fa23985c28ea20e0111.tar.bz2 historical-bd52ab926c43f46912736fa23985c28ea20e0111.zip |
Removed old, restructured double building, fixed openmp check, #340469
Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/fftw/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/fftw/Manifest | 13 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-2.1.5-r5.ebuild | 11 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-2.1.5-r6.ebuild | 144 | ||||
-rw-r--r-- | sci-libs/fftw/fftw-2.1.5-r7.ebuild | 64 |
5 files changed, 48 insertions, 192 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index 5e8bcf0e2b17..a56fc8395752 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/fftw -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.106 2010/12/02 21:50:49 jlec Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.107 2011/01/15 13:32:50 jlec Exp $ + + 15 Jan 2011; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r5.ebuild, + -fftw-2.1.5-r6.ebuild, fftw-2.1.5-r7.ebuild: + Removed old, restructured double building, fixed openmp check, #340469 *fftw-3.2.2-r1 (02 Dec 2010) diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest index 094a245691b9..619d077debd6 100644 --- a/sci-libs/fftw/Manifest +++ b/sci-libs/fftw/Manifest @@ -9,17 +9,16 @@ AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9 AUX fftw-3.2.2-pc-threads.patch 650 RMD160 3d0bb0caa62d29e2d0e8b5cff9c126276b537f81 SHA1 dd960030a8e49b87fc94c80cc541068c8b9466dd SHA256 26a442c168324623a60d1fc986f9c70ddf2d66d91e5d4a620ded1982bd22a593 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 DIST fftw-3.2.2.tar.gz 3495117 RMD160 27af9b97072fa3a41b91b9430d093f671a1cd359 SHA1 d43b799eedfb9408f62f9f056f5e8a645618467b SHA256 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f -EBUILD fftw-2.1.5-r5.ebuild 3826 RMD160 3348225ac8f5dd9b4d056b69746912a3f0f926e7 SHA1 21d67ff376abbbdca4cdeec4bd97f8de62f67103 SHA256 73dd0e71e3fa40e6ac065a0833d68abe84a3eae36f330a1aa53667b346c9f9b1 -EBUILD fftw-2.1.5-r6.ebuild 3916 RMD160 2549d62e7ac2ada8a805f3c93fb85695081fbdb0 SHA1 47fa223825248081c747d1fa835112b787ac0a75 SHA256 b9b437d2a44b904a4ec4f69d8e2adf81b3d674b1c843e6a2c17bada0c4bca641 -EBUILD fftw-2.1.5-r7.ebuild 4006 RMD160 9ab79abf78dbef3f064a397e6d433f64b4f4759d SHA1 a57614cbfbb85ae8af46c2bf35638e0a95120789 SHA256 e5c99e669f476d586c8d16a4c791dfcbee951736976efbc10bee86f05135f318 +EBUILD fftw-2.1.5-r5.ebuild 3726 RMD160 aa0fd9f75f42d19d58e57d7afa48e4c3e196042d SHA1 0b95fae49ee3c9a9f6d2a85e2c473c5035a2679f SHA256 6a0b0c66cf059b663d2749b7a433120b2ae35a560ea1465bc07682ecb2a7a598 +EBUILD fftw-2.1.5-r7.ebuild 3913 RMD160 208f5ae3a521fd50e1e0c975da5448f2e86a3708 SHA1 8e09f838265e4dde0ec6a791930a61ad96f47b92 SHA256 ab964c4eb76bff5a4c54f1c5cf81c638dd277284cefc558fa045ff3a73b4288e EBUILD fftw-3.2.2-r1.ebuild 3598 RMD160 4ff36f2502f9341f3a68c14f195dd4a5bb8f816e SHA1 d66cabc7c4372a7fcd5e2718255fa3ac3badf08b SHA256 a5601eac7e49514fa167ad6bd4f32c7bdc62a5955a8d63ccca773b109005c970 EBUILD fftw-3.2.2.ebuild 3685 RMD160 db06629f8b5fc82a6bdc04cadf6ec394ecd9fbae SHA1 7303b2c50ae2d9c20eb82891b59c3096cf4958ad SHA256 cb2c19e17fbe422769f43ca631708361c438f22f532bdda1639802fc9c0627e8 -MISC ChangeLog 20289 RMD160 c9126484626959b8c2436c90d609c31908cfb825 SHA1 64f8427a8ca5c841b3510f64159832e157a99d7b SHA256 e1c9c40d3e876c6cc19ff428581c6d6df1298f5752d30c5801e25a7a9dff4954 +MISC ChangeLog 20479 RMD160 f555686807c87faeaf730c50b62cacee1b68df64 SHA1 b7a6fc4b34f929e91f892d03f312b9e0c1be3ac9 SHA256 01118c3d667220fb779562723bfb9a126f0c1f94c5ae7fc5bb8e5103d535961a MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkz4FL8ACgkQgAnW8HDreRZPIgCcDlwyZVIWC+cmR6FQzCwUFtSU -I8MAoL1OcALymSrfrECkLOnbM3GEdECG -=rzsA +iEYEARECAAYFAk0xogoACgkQgAnW8HDreRa8DwCglxPsSBKZ39ouVEDnYxSoL5q4 +I54An2nIJi5uHlwOGaxQpmCqS5Rf+SYb +=Adqc -----END PGP SIGNATURE----- diff --git a/sci-libs/fftw/fftw-2.1.5-r5.ebuild b/sci-libs/fftw/fftw-2.1.5-r5.ebuild index 9f70b2b73786..117b97ebe6db 100644 --- a/sci-libs/fftw/fftw-2.1.5-r5.ebuild +++ b/sci-libs/fftw/fftw-2.1.5-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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-r5.ebuild,v 1.17 2010/04/09 18:41:27 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.18 2011/01/15 13:32:50 jlec Exp $ inherit eutils flag-o-matic autotools toolchain-funcs @@ -26,16 +26,11 @@ pkg_setup() { if use x86; then is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer" fi - if use openmp && - [[ $(tc-getCC)$ == *gcc* ]] && - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! has_version sys-devel/gcc[openmp] ) - then + if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! $(tc-has-openmp); then ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " ewarn "If you want to build fftw with OpenMP, abort now," ewarn "and switch CC to an OpenMP capable compiler" ewarn "Otherwise the configure script will select POSIX threads." - epause 5 fi use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) } diff --git a/sci-libs/fftw/fftw-2.1.5-r6.ebuild b/sci-libs/fftw/fftw-2.1.5-r6.ebuild deleted file mode 100644 index 5229c3872a2a..000000000000 --- a/sci-libs/fftw/fftw-2.1.5-r6.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2010 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-r6.ebuild,v 1.4 2010/07/01 06:58:03 grobian Exp $ - -EAPI="3" - -inherit autotools eutils flag-o-matic toolchain-funcs - -DESCRIPTION="Fast C library for the Discrete Fourier Transform" -SRC_URI="http://www.fftw.org/${P}.tar.gz" -HOMEPAGE="http://www.fftw.org" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -SLOT="2.1" -LICENSE="GPL-2" -IUSE="doc float fortran mpi openmp threads" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -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 use x86; then - is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer" - fi - if use openmp && - [[ $(tc-getCC)$ == *gcc* ]] && - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! has_version sys-devel/gcc[openmp] ) - then - ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " - ewarn "If you want to build fftw with OpenMP, abort now," - ewarn "and switch CC to an OpenMP capable compiler" - ewarn "Otherwise the configure script will select POSIX threads." - fi - use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed) -} - -src_prepare() { - # 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?) - - epatch "${FILESDIR}"/${P}-as-needed.patch - epatch "${FILESDIR}"/${P}-configure.in.patch - epatch "${FILESDIR}"/${P}-no-test.patch - - # fix info files - for infofile in doc/fftw*info*; do - cat >> ${infofile} <<-EOF - INFO-DIR-SECTION Libraries - START-INFO-DIR-ENTRY - * fftw: (fftw). ${DESCRIPTION} - END-INFO-DIR-ENTRY - EOF - done - - eautoreconf - - cd "${WORKDIR}" - cp -R ${P} ${P}-double - mv ${P} ${P}-single -} - -src_configure() { - local myconf=" - --enable-shared - --enable-type-prefix - --enable-vec-recurse - $(use_enable fortran) - $(use_enable mpi) - $(use_enable x86 i386-hacks)" - if use openmp; then - myconf="${myconf} - --enable-threads - --with-openmp" - elif use threads; then - myconf="${myconf} - --enable-threads - --without-openmp" - else - myconf="${myconf} - --disable-threads - --without-openmp" - fi - cd "${S}-single" - econf ${myconf} --enable-float || die "econf for float failed" - - cd "${S}-double" - econf ${myconf} || die "econf for double failed" -} - -src_compile() { - cd "${S}-single" - emake || die "emake for float failed" - - cd "${S}-double" - emake || die "emake for double failed" -} - -src_test() { - cd "${S}-single" - emake -j1 check || die "emake check single failed" - cd "${S}-double" - emake -j1 check || die "emake check double failed" -} - -src_install () { - # both builds are installed in the same place - # libs are distinguished by prefix (s or d), see docs for details - - cd "${S}-single" - emake DESTDIR="${D}" install || die "emake install float failed" - - cd "${S}-double" - emake DESTDIR="${D}" install || die "emake install double failed" - - insinto /usr/include - doins fortran/fftw_f77.i || die "doins failed" - dodoc AUTHORS ChangeLog NEWS TODO README README.hacks || die "dodoc failed" - use doc && dohtml doc/* - - if use float; then - for f in "${ED}"/usr/{include,$(get_libdir)}/*sfft*; do - ln -s $(basename ${f}) ${f/sfft/fft} - done - for f in "${ED}"/usr/{include,$(get_libdir)}/*srfft*; do - ln -s $(basename ${f}) ${f/srfft/rfft} - done - else - for f in "${ED}"/usr/{include,$(get_libdir)}/*dfft*; do - ln -s $(basename ${f}) ${f/dfft/fft} - done - for f in "${ED}"/usr/{include,$(get_libdir)}/*drfft*; do - ln -s $(basename ${f}) ${f/drfft/rfft} - done - fi -} diff --git a/sci-libs/fftw/fftw-2.1.5-r7.ebuild b/sci-libs/fftw/fftw-2.1.5-r7.ebuild index 625f5a00b148..f4a7e20fb115 100644 --- a/sci-libs/fftw/fftw-2.1.5-r7.ebuild +++ b/sci-libs/fftw/fftw-2.1.5-r7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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-r7.ebuild,v 1.1 2010/11/03 07:02:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r7.ebuild,v 1.2 2011/01/15 13:32:50 jlec Exp $ EAPI="3" @@ -28,11 +28,7 @@ pkg_setup() { if use x86; then is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer" fi - if use openmp && - [[ $(tc-getCC)$ == *gcc* ]] && - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || - ! has_version sys-devel/gcc[openmp] ) - then + if use openmp && [[ $(tc-getCC) == *gcc* ]] && ! $(tc-has-openmp); then ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " ewarn "If you want to build fftw with OpenMP, abort now," ewarn "and switch CC to an OpenMP capable compiler" @@ -71,6 +67,7 @@ src_prepare() { } src_configure() { + local dir local myconf=" --enable-shared --enable-type-prefix @@ -91,42 +88,47 @@ src_configure() { --disable-threads --without-openmp" fi - cd "${S}-single" - econf ${myconf} \ - --enable-float \ - --with-gcc=$(tc-getCC) \ - || die "econf for float failed" - - cd "${S}-double" - econf ${myconf} \ - --with-gcc=$(tc-getCC) \ - || die "econf for double failed" + + for dir in "${S}-single" "${S}-double" + do + einfo "Running configuration in ${dir}" + cd ${dir} + econf ${myconf} \ + --enable-float \ + --with-gcc=$(tc-getCC) + done } src_compile() { - cd "${S}-single" - emake || die "emake for float failed" - - cd "${S}-double" - emake || die "emake for double failed" + local dir + for dir in "${S}-single" "${S}-double" + do + einfo "Running compilation in ${dir}" + cd ${dir} + emake || die "emake failed in ${dir}" + done } src_test() { - cd "${S}-single" - emake -j1 check || die "emake check single failed" - cd "${S}-double" - emake -j1 check || die "emake check double failed" + local dir + for dir in "${S}-single" "${S}-double" + do + einfo "Running tests in ${dir}" + cd ${dir} + emake -j1 check || die "test failed in ${dir}" + done } src_install () { # both builds are installed in the same place # libs are distinguished by prefix (s or d), see docs for details - cd "${S}-single" - emake DESTDIR="${D}" install || die "emake install float failed" - - cd "${S}-double" - emake DESTDIR="${D}" install || die "emake install double failed" + local dir + for dir in "${S}-single" "${S}-double" + do + cd ${dir} + emake DESTDIR="${D}" install || die "installation failed in ${dir}" + done insinto /usr/include doins fortran/fftw_f77.i || die "doins failed" |