public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/files/, sci-libs/fftw/
@ 2011-08-20 10:29 Christoph Junghans
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans @ 2011-08-20 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d21cf0b476666eeb5dd3068b6bedbab1d8e2742f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 10:27:33 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Aug 20 10:27:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d21cf0b4

[sci-libs/fftw] version bump

(Portage version: 2.1.10.3/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/fftw/ChangeLog                            |    6 ++
 .../{fftw-3.3_alpha1.ebuild => fftw-3.3.ebuild}    |   37 +++++----
 sci-libs/fftw/files/fftw-3.2.1-as-needed.patch     |   82 --------------------
 3 files changed, 25 insertions(+), 100 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 99038b1..1ad3dbc 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fftw-3.3 (20 Aug 2011)
+
+  20 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
+  -files/fftw-3.2.1-as-needed.patch, -fftw-3.3_alpha1.ebuild, +fftw-3.3.ebuild:
+  version bump
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
   Streamlined fortran-2 eclass usage
 

diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.3.ebuild
similarity index 83%
rename from sci-libs/fftw/fftw-3.3_alpha1.ebuild
rename to sci-libs/fftw/fftw-3.3.ebuild
index 3d9e309..7c0e4c9 100644
--- a/sci-libs/fftw/fftw-3.3_alpha1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
-SRC_URI="http://www.fftw.org/${P//_}.tar.gz"
+SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3.0"
@@ -20,32 +20,23 @@ DEPEND="
 	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P//_}"
-
 pkg_setup() {
 	use openmp && FORTRAN_NEED_OPENMP="1"
 	use fortran && fortran-2_pkg_setup
-	FFTW_THREADS="--disable-threads --disable-openmp"
-	if use openmp; then
-		FFTW_THREADS="--disable-threads --enable-openmp"
-	elif use threads; then
-		FFTW_THREADS="--enable-threads --disable-openmp"
-	fi
+	use openmp && FFTW_OPENMP="--enable-openmp"
 	if use openmp && ! 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, we will build using POSIX threads."
 		epause 5
-		FFTW_THREADS="--enable-threads --disable-openmp"
+		FFTW_THREADS="--disable-openmp"
 	fi
 	FFTW_DIRS="single double longdouble"
 	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch
-
 	# fix info file for category directory
 	sed -i \
 		-e 's/Texinfo documentation system/Libraries/' \
@@ -67,7 +58,8 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable fortran)
 		$(use_enable mpi)
-		${FFTW_THREADS}"
+		$(use_enable threads)
+		${FFTW_OPENMP}"
 
 	local myconfsingle="${myconfcommon} --enable-single"
 	local myconfdouble="${myconfcommon}"
@@ -95,7 +87,7 @@ src_compile() {
 	for x in ${FFTW_DIRS}; do
 		cd "${S}-${x}"
 		einfo "Compiling for ${x} precision"
-		emake || die "emake for ${x} precision failed"
+		emake
 	done
 }
 
@@ -108,16 +100,18 @@ src_test () {
 	for x in ${FFTW_DIRS}; do
 		cd "${S}-${x}/tests"
 		einfo "Testing ${x} precision"
-		emake -j1 check || die "emake test ${x} failed"
+		emake -j1 check
 	done
 }
 
 src_install () {
+	local f u
+
 	# all builds are installed in the same place
 	# libs have distinuguished names; include files, docs etc. identical.
 	for x in ${FFTW_DIRS}; do
 		cd "${S}-${x}"
-		emake DESTDIR="${D}" install || die "emake install for ${x} failed"
+		emake DESTDIR="${D}" install
 	done
 
 	cd "${S}"
@@ -125,8 +119,15 @@ src_install () {
 	if use doc; then
 		cd doc
 		insinto /usr/share/doc/${PF}
-		doins -r html fftw3.pdf || die "doc install failed"
+		doins -r html fftw3.pdf
 		insinto /usr/share/doc/${PF}/faq
 		doins FAQ/fftw-faq.html/*
 	fi
+
+	use openmp && [[ ${FFTW_OPENMP} = "--enable-openmp" ]] && u="omp"
+	for f in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) ${u}; do
+		    sed "s|-lfftw3[lf]\?|&_$u|" "$f" > "${f%.pc}_$u.pc" || die
+		done
+	done
 }

diff --git a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch b/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch
deleted file mode 100644
index ee9c12a..0000000
--- a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Nur fftw-3.2.1.orig/configure.ac fftw-3.2.1/configure.ac
---- fftw-3.2.1.orig/configure.ac	2009-02-20 19:28:55.832163268 +0000
-+++ fftw-3.2.1/configure.ac	2009-02-26 15:02:37.533259854 +0000
-@@ -440,14 +440,15 @@
- AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no)
- 
- if test "$enable_openmp"x != nox; then
--   AX_OPENMP([THREADLIBS=" "
-+   AX_OPENMP([THREADLIBS="$OPENMP_LIBS"
-      AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])
-      CFLAGS="$CFLAGS $OPENMP_CFLAGS"],
--     [AC_MSG_ERROR([don't know how to enable OpenMP])])
-+     [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])])
-+else
-+   THREADLIBS=""
- fi
- 
- dnl Check for threads library...
--THREADLIBS=""
- if test "$enable_threads" = "yes"; then
- 	# POSIX threads, the default choice:
- 	if test -z "$THREADLIBS"; then
-diff -Nur fftw-3.2.1.orig/m4/ax_openmp.m4 fftw-3.2.1/m4/ax_openmp.m4
---- fftw-3.2.1.orig/m4/ax_openmp.m4	2009-02-20 19:28:55.792160754 +0000
-+++ fftw-3.2.1/m4/ax_openmp.m4	2009-02-26 15:02:08.887255943 +0000
-@@ -54,13 +54,18 @@
- done
- []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
- ])
-+OPENMP_LIBS=" "
- if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then
-   m4_default([$2],:)
- else
-   if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
-     OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
-+    if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then
-+        OPENMP_LIBS="-lgomp"
-+    fi
-   fi
-   m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
- fi
- AC_SUBST(OPENMP_[]_AC_LANG_PREFIX[]FLAGS)
-+AC_SUBST(OPENMP_LIBS)
- ])dnl AX_OPENMP
-diff -Nur fftw-3.2.1.orig/Makefile.am fftw-3.2.1/Makefile.am
---- fftw-3.2.1.orig/Makefile.am	2009-02-20 19:28:56.040169973 +0000
-+++ fftw-3.2.1/Makefile.am	2009-02-26 15:02:08.887255943 +0000
-@@ -36,6 +36,13 @@
- if SMP
- if COMBINED_THREADS
- COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la
-+else
-+lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la
-+libfftw3@PREC_SUFFIX@_threads_la_SOURCES = 
-+libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \
-+	libfftw3@PREC_SUFFIX@.la \
-+	threads/libfftw3@PREC_SUFFIX@_threads.la
- endif
- endif
- 
-diff -Nur fftw-3.2.1.orig/threads/Makefile.am fftw-3.2.1/threads/Makefile.am
---- fftw-3.2.1.orig/threads/Makefile.am	2009-02-20 19:28:55.832163268 +0000
-+++ fftw-3.2.1/threads/Makefile.am	2009-02-26 15:02:08.887255943 +0000
-@@ -2,11 +2,7 @@
- -I$(top_srcdir)/rdft -I$(top_srcdir)/api
- 
- if SMP
--if COMBINED_THREADS
- noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--else
--lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--endif
- endif
- 
- # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@
-@@ -16,4 +12,5 @@
- openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c	\
- vrank-geq1-rdft2.c f77api.c f77funcs.h
- 
-+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS)
- libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/files/, sci-libs/fftw/
@ 2013-09-01 18:08 Christoph Junghans
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans @ 2013-09-01 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     26069113fdc938df674f1aa53393cc0b3841a02f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 18:08:14 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 18:08:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=26069113

import from gx86

Package-Manager: portage-2.2.1

---
 sci-libs/fftw/ChangeLog                            |  10 ++
 sci-libs/fftw/fftw-3.3.3-r3.ebuild                 | 197 +++++++++++++++++++++
 sci-libs/fftw/fftw-9999.ebuild                     | 197 +++++++++++++++++++++
 .../fftw/files/fftw-3.3.3-install-header.patch     |  35 ++++
 sci-libs/fftw/metadata.xml                         |  23 +++
 5 files changed, 462 insertions(+)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
new file mode 100644
index 0000000..d82a81d
--- /dev/null
+++ b/sci-libs/fftw/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-libs/fftw
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*fftw-3.3.3-r3 (01 Sep 2013)
+*fftw-9999 (01 Sep 2013)
+
+  01 Sep 2013; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3.3-r3.ebuild,
+  +fftw-9999.ebuild, +files/fftw-3.3.3-install-header.patch, +metadata.xml:
+  import from gx86

diff --git a/sci-libs/fftw/fftw-3.3.3-r3.ebuild b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
new file mode 100644
index 0000000..9af7694
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
@@ -0,0 +1,197 @@
+# 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.3 2013/06/27 14:30:29 aballier 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/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	PATCHES=( "${FILESDIR}/${P}-install-header.patch" )
+	AUTOTOOLS_AUTORECONF=1
+fi
+
+LICENSE="GPL-2"
+SLOT="3.0"
+IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( virtual/mpi )
+	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 )"
+
+#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
+		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() {
+	local ext="info"
+	[[ ${PV} = *9999 ]] && ext="texi"
+	# fix info file for category directory
+	sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3."${ext}" || 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=${FFTW_PRECISION}
+		# there is no abi_x86_32 port of virtual/mpi right now
+		local enable_mpi=$(use_enable mpi)
+		multilib_is_native_abi || enable_mpi="--disable-mpi"
+
+		#jlec reported USE=quad on abi_x86_32 has too less registers
+		multilib_is_native_abi || [[ $x != quad ]] || return 0
+
+		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)
+				${enable_mpi}
+				$(use_enable neon)
+			)
+		elif [[ $x == double ]]; then
+			myeconfargs+=(
+				$(use_enable avx)
+				$(use_enable sse2)
+				${enable_mpi}
+			)
+		elif [[ $x == longdouble ]]; then
+			myeconfargs+=(
+				--enable-long-double
+				${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-utils_src_configure
+	}
+
+	my_abi_configure() {
+		#multilib_parallel_foreach_abi changes MULTIBUILD_VARIANT
+		export FFTW_PRECISION=${MULTIBUILD_VARIANT}
+		multilib_parallel_foreach_abi my_configure
+		unset FFTW_PRECISION
+	}
+
+	multibuild_foreach_variant my_abi_configure
+}
+
+abi_has_precision() {
+	#not all abi have all precisions
+	[[ -f ${BUILD_DIR}/Makefile ]] || return 0
+	"$@"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_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 multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck
+}
+
+src_install () {
+	local u x
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	#copied from autotools-multilib_secure_install
+	my_abi_src_install() {
+		my_abi_secure_install() {
+			autotools-utils_src_install
+			if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+				multilib_prepare_wrappers
+				multilib_check_headers
+			fi
+		}
+
+		multilib_foreach_abi abi_has_precision my_abi_secure_install
+		#don't mix checksum	of different precisions
+		rm -f "${T}"/.multilib_header_cksum
+	}
+	multibuild_foreach_variant my_abi_src_install
+	multilib_install_wrappers
+
+	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
+}

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
new file mode 100644
index 0000000..9af7694
--- /dev/null
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -0,0 +1,197 @@
+# 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.3 2013/06/27 14:30:29 aballier 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/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	PATCHES=( "${FILESDIR}/${P}-install-header.patch" )
+	AUTOTOOLS_AUTORECONF=1
+fi
+
+LICENSE="GPL-2"
+SLOT="3.0"
+IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( virtual/mpi )
+	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 )"
+
+#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
+		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() {
+	local ext="info"
+	[[ ${PV} = *9999 ]] && ext="texi"
+	# fix info file for category directory
+	sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3."${ext}" || 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=${FFTW_PRECISION}
+		# there is no abi_x86_32 port of virtual/mpi right now
+		local enable_mpi=$(use_enable mpi)
+		multilib_is_native_abi || enable_mpi="--disable-mpi"
+
+		#jlec reported USE=quad on abi_x86_32 has too less registers
+		multilib_is_native_abi || [[ $x != quad ]] || return 0
+
+		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)
+				${enable_mpi}
+				$(use_enable neon)
+			)
+		elif [[ $x == double ]]; then
+			myeconfargs+=(
+				$(use_enable avx)
+				$(use_enable sse2)
+				${enable_mpi}
+			)
+		elif [[ $x == longdouble ]]; then
+			myeconfargs+=(
+				--enable-long-double
+				${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-utils_src_configure
+	}
+
+	my_abi_configure() {
+		#multilib_parallel_foreach_abi changes MULTIBUILD_VARIANT
+		export FFTW_PRECISION=${MULTIBUILD_VARIANT}
+		multilib_parallel_foreach_abi my_configure
+		unset FFTW_PRECISION
+	}
+
+	multibuild_foreach_variant my_abi_configure
+}
+
+abi_has_precision() {
+	#not all abi have all precisions
+	[[ -f ${BUILD_DIR}/Makefile ]] || return 0
+	"$@"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_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 multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck
+}
+
+src_install () {
+	local u x
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	#copied from autotools-multilib_secure_install
+	my_abi_src_install() {
+		my_abi_secure_install() {
+			autotools-utils_src_install
+			if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+				multilib_prepare_wrappers
+				multilib_check_headers
+			fi
+		}
+
+		multilib_foreach_abi abi_has_precision my_abi_secure_install
+		#don't mix checksum	of different precisions
+		rm -f "${T}"/.multilib_header_cksum
+	}
+	multibuild_foreach_variant my_abi_src_install
+	multilib_install_wrappers
+
+	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
+}

diff --git a/sci-libs/fftw/files/fftw-3.3.3-install-header.patch b/sci-libs/fftw/files/fftw-3.3.3-install-header.patch
new file mode 100644
index 0000000..4456c18
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.3.3-install-header.patch
@@ -0,0 +1,35 @@
+From f450afa1cc0bb962abecfc1ffdbef8e1f7b748e4 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <ottxor@gentoo.org>
+Date: Sat, 31 Aug 2013 21:21:28 -0600
+Subject: [PATCH] Only install f03 header of the active precision
+
+---
+ api/Makefile.am | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/api/Makefile.am b/api/Makefile.am
+index e4eaad7..bb6c042 100644
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -4,8 +4,17 @@ AM_CFLAGS = $(STACK_ALIGN_CFLAGS)
+ 
+ EXTRA_DIST = f03api.sh genf03.pl fftw3.f03.in
+ 
+-include_HEADERS = fftw3.h fftw3.f fftw3l.f03 fftw3q.f03
++include_HEADERS = fftw3.h fftw3.f
++noinst_HEADERS = fftw3l.f03 fftw3q.f03
++if LDOUBLE
++include_HEADERS += fftw3l.f03
++else
++if QUAD
++include_HEADERS += fftw3q.f03
++else
+ nodist_include_HEADERS = fftw3.f03
++endif
++endif
+ noinst_LTLIBRARIES = libapi.la
+ 
+ # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@
+-- 
+1.8.1.5
+

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
new file mode 100644
index 0000000..50e74c1
--- /dev/null
+++ b/sci-libs/fftw/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+  <longdescription lang="en">
+  The Fastest Fourier Transform in the West is a C subroutine library
+  for computing the Discrete Fourier Transform (DFT) in one or more
+  dimensions, of both real and complex data, and of arbitrary input
+  size. It is becoming the FFT library of choice for most
+  applications. Benchmarks, performed on a variety of platforms, show
+  that FFTW's performance is typically superior to that of other
+  publicly available FFT software.
+</longdescription>
+  <use>
+    <flag name="avx">Adds support for Advanced Vector Extensions</flag>
+    <flag name="fma">Use the Fused Multiply Add instruction set (fma3/fma4 either one)</flag>
+    <flag name="quad">Build quadruple precision lib</flag>
+    <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
+  </use>
+  <upstream>
+    <remote-id type="freecode">fftw</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-09-01 18:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-20 10:29 [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/files/, sci-libs/fftw/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2013-09-01 18:08 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox