Respect CC (bug #343945).

(Portage version: 2.1.9.24/cvs/Linux i686)

3 files changed, 177 insertions, 1 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 7ec4c6ec8d41..67d771b935ac 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2010/07/01 06:58:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.105 2010/11/03 07:02:32 jer Exp $
+
+*fftw-2.1.5-r7 (03 Nov 2010)
+
+  03 Nov 2010; Jeroen Roovers <jer@gentoo.org> +fftw-2.1.5-r7.ebuild,
+  +files/fftw-2.1.5-cc.patch:
+  Respect CC (bug #343945).
 
   01 Jul 2010; Fabian Groffen <grobian@gentoo.org> fftw-2.1.5-r6.ebuild:
   Marked ~x86-macos and ~ppc-macos, bug #326391
diff --git a/sci-libs/fftw/fftw-2.1.5-r7.ebuild b/sci-libs/fftw/fftw-2.1.5-r7.ebuild
new file mode 100644
index 000000000000..625f5a00b148
--- /dev/null
+++ b/sci-libs/fftw/fftw-2.1.5-r7.ebuild
@@ -0,0 +1,151 @@
+# 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-r7.ebuild,v 1.1 2010/11/03 07:02:32 jer 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 \
+		"${FILESDIR}"/${P}-configure.in.patch \
+		"${FILESDIR}"/${P}-no-test.patch \
+		"${FILESDIR}"/${P}-cc.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 \
+		--with-gcc=$(tc-getCC) \
+		|| die "econf for float failed"
+
+	cd "${S}-double"
+	econf ${myconf} \
+		--with-gcc=$(tc-getCC) \
+		|| 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/files/fftw-2.1.5-cc.patch b/sci-libs/fftw/files/fftw-2.1.5-cc.patch
new file mode 100644
index 000000000000..aa5c6db038c8
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-2.1.5-cc.patch
@@ -0,0 +1,19 @@
+--- a/configure.in
++++ b/configure.in
+@@ -25,6 +25,8 @@
+ AC_ARG_WITH(gcc, [  --with-gcc              use gcc instead of the native compiler cc], ok=$withval, ok=no)
+ if test "$ok" = "yes"; then
+ 	CC=gcc
++else
++	CC=$withval
+ fi
+ 
+ AC_ARG_ENABLE(float, [  --enable-float          compile fftw for single precision], enable_float=$enableval, enable_float=no)
+@@ -96,6 +96,7 @@
+ AM_PROG_LIBTOOL
+ AC_CHECK_PROG(PERL, perl, perl, echo perl)
+ AC_SUBST(PERL)
++AC_SUBST(CC)
+ 
+ dnl -----------------------------------------------------------------------
+