diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2008-08-23 11:43:27 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-08-23 11:43:27 +0000 |
commit | f089561dbc98d6fe61b9af3fd43fc874fe4daf23 (patch) | |
tree | 2f5b97d1bfa743f042189b78e3fcfef8b3cbf4d0 /sci-physics | |
parent | stable amd64, bug 235518 (diff) | |
download | historical-f089561dbc98d6fe61b9af3fd43fc874fe4daf23.tar.gz historical-f089561dbc98d6fe61b9af3fd43fc874fe4daf23.tar.bz2 historical-f089561dbc98d6fe61b9af3fd43fc874fe4daf23.zip |
Fixed for propagation with fortran compilers and flags, bug #235501
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64
Diffstat (limited to 'sci-physics')
-rw-r--r-- | sci-physics/xfoil/ChangeLog | 5 | ||||
-rw-r--r-- | sci-physics/xfoil/Manifest | 10 | ||||
-rw-r--r-- | sci-physics/xfoil/xfoil-6.97.ebuild | 20 |
3 files changed, 15 insertions, 20 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/Manifest b/sci-physics/xfoil/Manifest index 3f527837c931..6e775623f0a6 100644 --- a/sci-physics/xfoil/Manifest +++ b/sci-physics/xfoil/Manifest @@ -7,13 +7,13 @@ DIST dataflow.pdf 7654 RMD160 3e20242333cdab5f18b09603cd6d5df988629ea7 SHA1 cb0c DIST xfoil6.96.tar.gz 2542747 RMD160 27a2878ecccfcd713e0d6331c83cbe3fffa6cc12 SHA1 314cedc50cff919411583abb430309ffa84652c8 SHA256 9961dfe028eaa7247b64c7e8bb92d3befc673d80c3a288a30bf9e8e1c5dc385e DIST xfoil6.97.tar.gz 3972497 RMD160 54c218c858c9e82838441e62939d4daa3ceabc29 SHA1 f91ee2ee24367ffb77b836684b999691f83cc1b4 SHA256 293e28e269bd88a62f8b6ba6bf684f16843f6776736e6b77aaa8b6bebc467a81 EBUILD xfoil-6.96.ebuild 2318 RMD160 b28e8738f184be5ee903d301b730611471886845 SHA1 5581abe4d3a709f5dfc5528b3f4a49ee74bd54d5 SHA256 ab655b090eabe2df8e984c65ab8cb0bfb46816b397a42ea37cdbb2a872886feb -EBUILD xfoil-6.97.ebuild 2107 RMD160 ce5ec91cd660645b9e47a1ed78f587431fc78936 SHA1 823a1e276736ee5c4128872bc0b6977bae5ce858 SHA256 444705d6ae9d2ba02c9e72387e7a654a71d0ba36d41b7d6b017304cf56f9e73f -MISC ChangeLog 2532 RMD160 117a326c05805f90509004533a7d1eafa73407fa SHA1 1383b5c65e0a6f78b4e9f85d83ee28b0fbbb7774 SHA256 51c1b2a617a6da8cad57fbc2670e3c0506539a30b7dfdf5e967a2e31ac9b1ecc +EBUILD xfoil-6.97.ebuild 2039 RMD160 f62ad9c34caa1c005584488e94fb2969e55c2ee5 SHA1 7f161450304f948b4566767bb28d9c4538e5707f SHA256 6dd5c2681dbf219ed9592d4d8a94d3f1fcfdf2539ecbc7ad90685951ae9eb1a9 +MISC ChangeLog 2677 RMD160 8af1b1729fd0096a04b73f0ee1d2f3be09b58295 SHA1 6205926c5238d946b1ee95759e37867aacfd9220 SHA256 b14922660b50c0284b5f39b44973c675af44f90c750fc26d72d45a546f8c2a10 MISC metadata.xml 862 RMD160 e6be84075ef908c577d96b5a1ce12b77369b1dcf SHA1 702836e26377a6a8d18695ffadf9cdbb47a849c1 SHA256 9a2c764a3ce20df6baf4f48b155281d045a8e144a50627f4ab9007f13f0bd34a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiu4YgACgkQ1ycZbhPLE2BpdQCgpk83l/HkG4CelrpNr1eM3zdP -FgEAnRnFMxZbwA9NBF1cT4RH1Nxm+kBW -=ssRG +iEYEARECAAYFAkiv9/gACgkQ1ycZbhPLE2DpvQCfR3mbIWujq3plDzRHW4aOkJon +3TAAoKwNdvwKwZgbTr+wexaEkK2hmJ33 +=sDDI -----END PGP SIGNATURE----- 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 \ |