Respect CC (bug #343945).

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 180 insertions, 2 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/Manifest b/sci-libs/fftw/Manifest
index 28c94dff641d..8be0b0266558 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,4 +1,5 @@
 AUX fftw-2.1.5-as-needed.patch 4374 RMD160 b9bc387a322cec9d36d7d7ff54e556e907767742 SHA1 3274a914d3532190fb8c2c96d944c85b5ab47237 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0
+AUX fftw-2.1.5-cc.patch 546 RMD160 55dc73f7191330c0c580edc58e754963afd0d181 SHA1 c2faf5d00139e0904e1b61b9491f3e8430f151cc SHA256 52b2ba8a140e46e9a1f1c71d8e85faaac70e6d783ba8e45f4423ba6f70f04dbe
 AUX fftw-2.1.5-configure.in.patch 8208 RMD160 a1b764dcee85ce7c70b4145feb7c19c82f820562 SHA1 0cddf5f0a3aa6ac196b9ebb9e2af9a9f3202d391 SHA256 67a153b67cd8aef3fedd92da09185063ac0cb17d63f1a06c5f480873e037d6cd
 AUX fftw-2.1.5-no-test.patch 1247 RMD160 deeb232de9301eaf6363b3ae86fa2e940bd46018 SHA1 271d92082832b522a9abad89652c9ccf1167964f SHA256 9a6cad5e81b4a68ef6c8e137a189ffad462cbbea4850211969417b03768eede1
 AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9c73 SHA1 c831f88d297579f6feed13a726184dea7f2362f8 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c
@@ -6,6 +7,7 @@ DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 S
 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-3.2.2.ebuild 3685 RMD160 db06629f8b5fc82a6bdc04cadf6ec394ecd9fbae SHA1 7303b2c50ae2d9c20eb82891b59c3096cf4958ad SHA256 cb2c19e17fbe422769f43ca631708361c438f22f532bdda1639802fc9c0627e8
-MISC ChangeLog 19963 RMD160 6148bf3f41d6555dc801dc0e7e5ca5213381f343 SHA1 32cb3424602235bd066e761b958896f2498833f9 SHA256 6a76864e4a4c115a8791a2cde3465675ca560baba27880da1bcc43a513822b99
+MISC ChangeLog 20118 RMD160 b326771e89f17d4f9b29428577427eb7bd3f5f46 SHA1 4030b76b91ea837155d219635f64401b41d08a2e SHA256 f4b70dc8d742b771044a6df27592fd357a495f9c77e213593deac09620ebc205
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
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 -----------------------------------------------------------------------
+