Updated to address static makefiles ignoring flags; see bug 334901.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 29 insertions, 25 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/Manifest b/sci-libs/libbufr/Manifest
index 455edb9e814c..d996887e2842 100644
--- a/sci-libs/libbufr/Manifest
+++ b/sci-libs/libbufr/Manifest
@@ -1,5 +1,5 @@
 AUX libbufr-000360-gcc-includes.patch 340 RMD160 daec028f6f851b43c7135070f3339b0cb0588e6f SHA1 a5127d09a7e4c70912928fed2ea51930a5d17e5e SHA256 cd801ea33c0586fadd8612a5430944de4abd57633bccbabeedb6ce7d29c9ebc5
 DIST bufr_000360.tar.gz 1537951 RMD160 c53769c79f0918a35304aa549a82f1b19cd33972 SHA1 4801e75b17e8c9fca1ea002306d0a464551fb803 SHA256 17290638f9886888fe91602b2b087080e36dd223aecc14a5c07472fabfe451e0
-EBUILD libbufr-000360.ebuild 3562 RMD160 66451a2c5c4c8772a3988d5d5c017ee1b5f6dea0 SHA1 22af6c329dfc188ad51527b772a313f2b46f009a SHA256 1fa3ab51e2ea66714760c3aaaa76550b880534b17b2aec1ba4be41fed7caca4b
-MISC ChangeLog 915 RMD160 11372ea5faec75c9e2e52e160084e4a9fedd5a8d SHA1 a0ff108c663191c212048104908b9a5bb822718f SHA256 ec7811c3ccb7eefc2cc080b9790b104a628fe6a156877efbdae03964ba15a01f
+EBUILD libbufr-000360.ebuild 3563 RMD160 1cf61e0d7fb4fccd3a33e07cbb343f16a340ef1a SHA1 d37057d1987f23e916cfccb67ee8b7530b105026 SHA256 bcd2caa10b913611c9b6d8689cd97054f2520b39bed699bae6bac0d2c33c2477
+MISC ChangeLog 1102 RMD160 27df24bdecd1372243bc19bc49188f3077d18207 SHA1 fc288fa7d5a29b302262c14c0a1a809920d73862 SHA256 14641ccc548a2249436355e32e061649d37fdde1f0f05efd8d77c13e0041ea0c
 MISC metadata.xml 481 RMD160 29cdd0d79faf556b9ed448baa4464e13e2c04709 SHA1 45918a7586cda54547e7dd2c4258518233d66a57 SHA256 956b1d320591634866867b8b0f57104ea56f53810ab66280b39733d710535f1b
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
 }