ottxor 14/08/06 22:10:47 Modified: fftw-3.3.4.ebuild ChangeLog Removed: fftw-3.3.3-r3.ebuild Log: disable header wrapping (bug #519094) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.4 sci-libs/fftw/fftw-3.3.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild?r1=1.3&r2=1.4 Index: fftw-3.3.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fftw-3.3.4.ebuild 17 Jun 2014 15:52:04 -0000 1.3 +++ fftw-3.3.4.ebuild 6 Aug 2014 22:10:47 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.3 2014/06/17 15:52:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.4 2014/08/06 22:10:47 ottxor Exp $ EAPI=5 @@ -32,14 +32,6 @@ DEPEND="${RDEPEND} test? ( dev-lang/perl )" -#can go once mpi is multlib -MULTILIB_WRAPPED_HEADERS=( - /usr/include/fftw3-mpi.h - /usr/include/fftw3l-mpi.f03 - /usr/include/fftw3-mpi.f03 - /usr/include/fftw3q.f03 -) - pkg_setup() { # XXX: this looks like it should be used with BUILD_TYPE!=binary if use openmp; then @@ -154,20 +146,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS ) HTML_DOCS=( doc/html/ ) - #copied from autotools-multilib_secure_install - my_abi_src_install() { - autotools-utils_src_install - #https://github.com/FFTW/fftw3/pull/6 - # f03 are installed unconditionally, not a big problem as the quad - # header is the only one to be wrapped. - [[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03" - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - multilib_check_headers - fi - } - multibuild_foreach_variant multilib_foreach_abi my_abi_src_install - multilib_install_wrappers + multibuild_foreach_variant multilib_parallel_foreach_abi autotools-utils_src_install if use doc; then dodoc doc/*.pdf 1.159 sci-libs/fftw/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.159&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.159&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.158&r2=1.159 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- ChangeLog 17 Jun 2014 15:52:04 -0000 1.158 +++ ChangeLog 6 Aug 2014 22:10:47 -0000 1.159 @@ -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.158 2014/06/17 15:52:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.159 2014/08/06 22:10:47 ottxor Exp $ + + 06 Aug 2014; Christoph Junghans <ott...@gentoo.org> -fftw-3.3.3-r3.ebuild, + fftw-3.3.4.ebuild: + disable header wrapping (bug #519094) 17 Jun 2014; Michał Górny <mgo...@gentoo.org> fftw-3.3.4.ebuild: Use ${ABI} to disable quad precision w/ abi_x86_32.
