* [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-3.3.3-r2.ebuild fftw-3.3.3-r1.ebuild
@ 2013-05-01 13:33 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2013-05-01 13:33 UTC (permalink / raw
To: gentoo-commits
jlec 13/05/01 13:33:43
Modified: ChangeLog fftw-3.3.3-r2.ebuild fftw-3.3.3-r1.ebuild
Log:
sci-libs/fftw: Fix blocker of incompatible emul package versions, thanks mgorny
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Revision Changes Path
1.141 sci-libs/fftw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 17 Apr 2013 06:26:21 -0000 1.140
+++ ChangeLog 1 May 2013 13:33:43 -0000 1.141
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/fftw
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.140 2013/04/17 06:26:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.141 2013/05/01 13:33:43 jlec Exp $
+
+ 01 May 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild,
+ fftw-3.3.3-r2.ebuild:
+ Fix blocker of incompatible emul package versions, thanks mgorny
17 Apr 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild,
+files/fftw-2.1.5-texinfo5.1.patch:
1.2 sci-libs/fftw/fftw-3.3.3-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?r1=1.1&r2=1.2
Index: fftw-3.3.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fftw-3.3.3-r2.ebuild 10 Mar 2013 18:47:22 -0000 1.1
+++ fftw-3.3.3-r2.ebuild 1 May 2013 13:33:43 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1 2013/03/10 18:47:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.2 2013/05/01 13:33:43 jlec Exp $
EAPI=5
@@ -23,7 +23,7 @@
RDEPEND="
mpi? ( virtual/mpi )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
1.4 sci-libs/fftw/fftw-3.3.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?r1=1.3&r2=1.4
Index: fftw-3.3.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fftw-3.3.3-r1.ebuild 10 Mar 2013 18:47:22 -0000 1.3
+++ fftw-3.3.3-r1.ebuild 1 May 2013 13:33:43 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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-r1.ebuild,v 1.3 2013/03/10 18:47:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.4 2013/05/01 13:33:43 jlec Exp $
EAPI=5
@@ -22,7 +22,7 @@
REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
RDEPEND="mpi? ( virtual/mpi )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-3.3.3-r2.ebuild fftw-3.3.3-r1.ebuild
@ 2013-06-27 14:30 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-27 14:30 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/27 14:30:29
Modified: ChangeLog fftw-3.3.3-r2.ebuild fftw-3.3.3-r1.ebuild
Log:
fix emul-linux blocker
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.143 sci-libs/fftw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.142&r2=1.143
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ChangeLog 3 May 2013 14:19:13 -0000 1.142
+++ ChangeLog 27 Jun 2013 14:30:29 -0000 1.143
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/fftw
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.142 2013/05/03 14:19:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.143 2013/06/27 14:30:29 aballier Exp $
+
+ 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> fftw-3.3.3-r1.ebuild,
+ fftw-3.3.3-r2.ebuild:
+ fix emul-linux blocker
03 May 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild:
Fix obsolete macros to work with automake-1.13, #468456
1.3 sci-libs/fftw/fftw-3.3.3-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?r1=1.2&r2=1.3
Index: fftw-3.3.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fftw-3.3.3-r2.ebuild 1 May 2013 13:33:43 -0000 1.2
+++ fftw-3.3.3-r2.ebuild 27 Jun 2013 14:30:29 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.2 2013/05/01 13:33:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.3 2013/06/27 14:30:29 aballier Exp $
EAPI=5
@@ -23,7 +23,8 @@
RDEPEND="
mpi? ( virtual/mpi )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
1.5 sci-libs/fftw/fftw-3.3.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?r1=1.4&r2=1.5
Index: fftw-3.3.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fftw-3.3.3-r1.ebuild 1 May 2013 13:33:43 -0000 1.4
+++ fftw-3.3.3-r1.ebuild 27 Jun 2013 14:30:29 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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-r1.ebuild,v 1.4 2013/05/01 13:33:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.5 2013/06/27 14:30:29 aballier Exp $
EAPI=5
@@ -22,7 +22,8 @@
REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
RDEPEND="mpi? ( virtual/mpi )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-3.3.3-r2.ebuild fftw-3.3.3-r1.ebuild
@ 2013-03-10 18:47 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2013-03-10 18:47 UTC (permalink / raw
To: gentoo-commits
jlec 13/03/10 18:47:22
Modified: ChangeLog fftw-3.3.3-r1.ebuild
Added: fftw-3.3.3-r2.ebuild
Log:
sci-libs/fftw: Multibuild for the precision builds, thanks mgorny to prepare the patch; restrict USE=quad for x86 as there are to less registers
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Revision Changes Path
1.139 sci-libs/fftw/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.138&r2=1.139
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- ChangeLog 1 Mar 2013 19:03:46 -0000 1.138
+++ ChangeLog 10 Mar 2013 18:47:22 -0000 1.139
@@ -1,6 +1,13 @@
# ChangeLog for sci-libs/fftw
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.138 2013/03/01 19:03:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.139 2013/03/10 18:47:22 jlec Exp $
+
+*fftw-3.3.3-r2 (10 Mar 2013)
+
+ 10 Mar 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild,
+ +fftw-3.3.3-r2.ebuild:
+ Multibuild for the precision builds, thanks mgorny to prepare the patch;
+ restrict USE=quad for x86 as there are to less registers
01 Mar 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild:
Block 32bit ABI with USE=mpi on amd64, #459758
1.3 sci-libs/fftw/fftw-3.3.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild?r1=1.2&r2=1.3
Index: fftw-3.3.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fftw-3.3.3-r1.ebuild 1 Mar 2013 19:03:46 -0000 1.2
+++ fftw-3.3.3-r1.ebuild 10 Mar 2013 18:47:22 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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-r1.ebuild,v 1.2 2013/03/01 19:03:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.3 2013/03/10 18:47:22 jlec Exp $
EAPI=5
@@ -18,8 +18,8 @@
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"
-# there is no abi_x86_32 vort virtual/mpi right now
-REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi ) )"
+# there is no abi_x86_32 port of virtual/mpi right now
+REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
RDEPEND="mpi? ( virtual/mpi )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
1.1 sci-libs/fftw/fftw-3.3.3-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild?rev=1.1&content-type=text/plain
Index: fftw-3.3.3-r2.ebuild
===================================================================
# Copyright 1999-2013 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.1 2013/03/10 18:47:22 jlec Exp $
EAPI=5
#AUTOTOOLS_AUTORECONF=1
FORTRAN_NEEDED=fortran
inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
DESCRIPTION="Fast C library for the Discrete Fourier Transform"
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 ~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"
# there is no abi_x86_32 port of virtual/mpi right now
REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
RDEPEND="
mpi? ( virtual/mpi )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
pkg_setup() {
# XXX: this looks like it should be used with BUILD_TYPE!=binary
if use openmp; then
if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
ewarn "OpenMP is not available in your current selected gcc"
die "need openmp capable gcc"
fi
FORTRAN_NEED_OPENMP=1
fi
fortran-2_pkg_setup
MULTIBUILD_VARIANTS=( single double longdouble )
if use quad; then
if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
ewarn "quad precision only available for gcc >= 4.6"
die "need quad precision capable gcc"
fi
MULTIBUILD_VARIANTS+=( quad )
fi
}
src_prepare() {
# fix info file for category directory
sed -i \
-e 's/Texinfo documentation system/Libraries/' \
doc/fftw3.info || die "failed to fix info file"
autotools-utils_src_prepare
}
src_configure() {
local x
# filter -Os according to docs
replace-flags -Os -O2
my_configure() {
local x=${MULTIBUILD_VARIANT}
myeconfargs=(
$(use_enable fma)
$(use_enable fortran)
$(use_enable zbus mips-zbus-timer)
$(use_enable threads)
$(use_enable openmp)
)
if [[ $x == single ]]; then
#altivec, sse, single-paired only work for single
myeconfargs+=(
--enable-single
$(use_enable altivec)
$(use_enable avx)
$(use_enable sse)
$(use_enable mpi)
$(use_enable neon)
)
elif [[ $x == double ]]; then
myeconfargs+=(
$(use_enable avx)
$(use_enable sse2)
$(use_enable mpi)
)
elif [[ $x == longdouble ]]; then
myeconfargs+=(
--enable-long-double
$(use_enable mpi)
)
elif [[ $x == quad ]]; then
#quad does not support mpi
myeconfargs+=( --enable-quad-precision )
else
die "${x} precision not implemented in this ebuild"
fi
autotools-multilib_src_configure
}
multibuild_foreach_variant my_configure
}
src_compile() {
multibuild_foreach_variant autotools-multilib_src_compile
}
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"
# ${testbase} -${p}d || die "Failure: $n"
multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
}
src_install () {
local u x
DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
HTML_DOCS=( doc/html/ )
multibuild_foreach_variant autotools-multilib_src_install
if use doc; then
dodoc doc/*.pdf
insinto /usr/share/doc/${PF}/faq
doins -r doc/FAQ/fftw-faq.html/*
else
rm -r "${ED}"/usr/share/doc/${PF}/html
fi
for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
done
done
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-27 14:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-01 13:33 [gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-3.3.3-r2.ebuild fftw-3.3.3-r1.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2013-06-27 14:30 Alexis Ballier (aballier)
2013-03-10 18:47 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox