summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-08-23 11:43:27 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-08-23 11:43:27 +0000
commitd6f4baa4cc5ea15773c3291972de2001b3b3f415 (patch)
tree4bbce98a8c5ed88a17eaab56146fc4fe4a51ae3c /sci-physics
parentstable amd64, bug 235518 (diff)
downloadgentoo-2-d6f4baa4cc5ea15773c3291972de2001b3b3f415.tar.gz
gentoo-2-d6f4baa4cc5ea15773c3291972de2001b3b3f415.tar.bz2
gentoo-2-d6f4baa4cc5ea15773c3291972de2001b3b3f415.zip
Fixed for propagation with fortran compilers and flags, bug #235501
(Portage version: 2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64)
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/xfoil/ChangeLog5
-rw-r--r--sci-physics/xfoil/xfoil-6.97.ebuild20
2 files changed, 10 insertions, 15 deletions
diff --git a/sci-physics/xfoil/ChangeLog b/sci-physics/xfoil/ChangeLog
index 585208f0eabd..d795262e0b11 100644
--- a/sci-physics/xfoil/ChangeLog
+++ b/sci-physics/xfoil/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-physics/xfoil
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.8 2008/08/22 15:55:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/ChangeLog,v 1.9 2008/08/23 11:43:27 bicatali Exp $
+
+ 23 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org> xfoil-6.97.ebuild:
+ Fixed for propagation with fortran compilers and flags, bug #235501
*xfoil-6.97 (22 Aug 2008)
diff --git a/sci-physics/xfoil/xfoil-6.97.ebuild b/sci-physics/xfoil/xfoil-6.97.ebuild
index d04d3f7e769c..075a209a13e6 100644
--- a/sci-physics/xfoil/xfoil-6.97.ebuild
+++ b/sci-physics/xfoil/xfoil-6.97.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.97.ebuild,v 1.1 2008/08/22 15:55:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/xfoil/xfoil-6.97.ebuild,v 1.2 2008/08/23 11:43:27 bicatali Exp $
inherit eutils fortran
@@ -22,22 +22,13 @@ FORTRAN="gfortran ifc g77"
src_unpack() {
unpack ${A}
cd "${S}"
-
- sed -i \
- -e 's/-O3//g' \
- plotlib/config.make || die "sed plotlib/config.make failed"
- cat >> plotlib/config.make <<-EOF
- FC = ${FORTRANC}
- CFLAGS += ${CFLAGS}
- FFLAGS += ${FFLAGS:--O2}
- EOF
-
sed -i \
-e '/^FC/d' \
- -e '/^FFLAGS/d' \
-e '/^CC/d' \
+ -e '/^FFLAGS/d' \
+ -e '/^CFLAGS/d' \
-e 's/^\(FFLOPT .*\)/FFLOPT = $(FFLAGS)/g' \
- bin/Makefile orrs/bin/Makefile \
+ bin/Makefile plotlib/Makefile plotlib/config.make orrs/bin/Makefile \
|| die "sed for flags and compilers failed"
# fix bug #147033
@@ -50,12 +41,13 @@ src_unpack() {
}
src_compile() {
+ export FC="${FORTRANC}" F77="${FORTRANC}"
cd "${S}"/orrs/bin
emake FLG="${FFLAGS}" FTNLIB="" OS || die "failed to build orrs"
cd "${S}"/orrs
bin/osgen osmaps_ns.lst
cd "${S}"/plotlib
- emake || die "failed to build plotlib"
+ emake CFLAGS="${CFLAGS} -DUNDERSCORE" || die "failed to build plotlib"
cd "${S}"/bin
for i in xfoil pplot pxplot; do
emake \