diff options
| -rw-r--r-- | sci-libs/libbufr/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/libbufr/libbufr-000360.ebuild | 42 |
2 files changed, 27 insertions, 23 deletions
diff --git a/sci-libs/libbufr/ChangeLog b/sci-libs/libbufr/ChangeLog index e1ff32ba97e6..aa7f9c2871a3 100644 --- a/sci-libs/libbufr/ChangeLog +++ b/sci-libs/libbufr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/libbufr -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/ChangeLog,v 1.3 2010/12/28 03:20:41 nerdboy Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/ChangeLog,v 1.4 2011/03/17 06:20:45 nerdboy Exp $ + + 17 Mar 2011; Steve Arnold <nerdboy@gentoo.org> libbufr-000360.ebuild: + Updated to address static makefiles ignoring flags; see bug 334901. + New version with ppc support coming soon. 28 Dec 2010; Steve Arnold <nerdboy@gentoo.org> libbufr-000360.ebuild, +files/libbufr-000360-gcc-includes.patch: diff --git a/sci-libs/libbufr/libbufr-000360.ebuild b/sci-libs/libbufr/libbufr-000360.ebuild index dab1151142dc..4fa583329619 100644 --- a/sci-libs/libbufr/libbufr-000360.ebuild +++ b/sci-libs/libbufr/libbufr-000360.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/libbufr-000360.ebuild,v 1.4 2010/12/28 03:20:41 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/libbufr-000360.ebuild,v 1.5 2011/03/17 06:20:45 nerdboy Exp $ EAPI="2" @@ -34,7 +34,7 @@ pkg_setup() { export CNAME="_gnu" ;; *pgf90|*pgf77) - export CNAME="_linux" + export CNAME="" ;; ifc|ifort) export CNAME="_intel" @@ -43,19 +43,10 @@ pkg_setup() { export target="linux" case "${ARCH}" in - amd64|ppc64) + amd64) export A64="A64" export R64="R64" ;; - ia64) - export A64="" - export R64="R64" - export target="itanium" - ;; - hppa) - export target="hppa" - export R64="" - ;; *) export A64="" export R64="" @@ -66,14 +57,19 @@ pkg_setup() { src_prepare() { find . -type f | xargs chmod -x chmod +x bufrtables/links.sh - if use debug ; then - sed -i -e "s:-O2:-g ${CFLAGS}:g" \ - config/config.$target$CNAME$R64$A64 - else - sed -i -e "s:-O2:${CFLAGS}:g" \ - config/config.$target$CNAME$R64$A64 - fi + local config="config/config.$target$CNAME$R64$A64" + + sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" $config + + # add local CFLAGS to and build flags + use debug || sed -i -e "s|\$(DEBUG)|${CFLAGS}|" $config + + # add local LDFLAGS to link commands + sed -i \ + -e "s|-o|${LDFLAGS} -o|" \ + examples/Makefile \ + bufrtables/Makefile # updated for newer gcc epatch "${FILESDIR}"/${P}-gcc-includes.patch } @@ -155,7 +151,11 @@ generate_files() { N N N + 1 + - Y + + + N EOF } |