summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-03-21 19:29:10 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-03-21 19:29:10 +0000
commit9481abaf4dc819f2bdae011e6ab06b1851934cd3 (patch)
tree2d585ef0f77270d4ac12e6e5c021dfa717330db9 /sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
parentMake net-tools a dependency only for linux kernel. (diff)
downloadhistorical-9481abaf4dc819f2bdae011e6ab06b1851934cd3.tar.gz
historical-9481abaf4dc819f2bdae011e6ab06b1851934cd3.tar.bz2
historical-9481abaf4dc819f2bdae011e6ab06b1851934cd3.zip
(#121855) Allow compilation with gcc-4. Also at least partially fix compilation with non-gcc compilers (e.g. ifc).
Package-Manager: portage-2.1_pre6-r3
Diffstat (limited to 'sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild')
-rw-r--r--sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild19
1 files changed, 17 insertions, 2 deletions
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
index b8cb5c783388..0d201f1418a8 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.4 2006/02/02 16:23:03 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.5 2006/03/21 19:29:10 spyderous Exp $
inherit eutils toolchain-funcs fortran
@@ -24,19 +24,34 @@ PROVIDE="virtual/blas"
S="${WORKDIR}/ATLAS"
RPATH="${DESTTREE}/$(get_libdir)/blas"
-FORTRAN="g77"
+FORTRAN="g77 gfortran"
src_unpack() {
unpack ${A}
cd ${S}
epatch "${FILESDIR}"/unbuffered.patch
+ epatch "${FILESDIR}"/${PV}-allow-any-gcc-version.patch
epatch "${DISTDIR}"/atlas3.6.0-shared-libs.1.patch.bz2
sed -i \
-e "s:ASM:ASM VOLATILE:" \
include/contrib/camm_dpa.h \
|| die "sed failed to fix clobbering"
+ sed -i \
+ -e "s:\(\t./xconfig\):\1 -m $(tc-getCC) -c $(tc-getCC) -f ${FORTRANC}:g" \
+ ${S}/Makefile \
+ || die "Failed to fix compilers"
+
+ if [[ $(gcc-major-version) -ge 4 ]]; then
+ einfo "Updating Makefiles for gcc-4"
+ sed -i \
+ -e "s:g2c:gfortran:g" \
+ ${S}/Make.top \
+ ${S}/makes/Make.lib \
+ || die "Failed to update for gcc-4"
+ fi
+
cp "${FILESDIR}"/war "${S}"
chmod a+x "${S}"/war
}