Add fix from upstream for ccnoco test failure with custom LDFLAGS #203914 by Carsten Lohrke.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

7 files changed, 54 insertions, 8 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index 6bff5aa9009b..0866c6afc6cd 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.137 2009/05/17 20:50:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.138 2009/05/29 23:41:11 vapier Exp $
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org> automake-1.5.ebuild,
+  automake-1.6.3.ebuild, automake-1.7.9-r1.ebuild, automake-1.8.5-r3.ebuild,
+  automake-1.9.6-r2.ebuild, +files/automake-1.10-ccnoco-ldflags.patch:
+  Add fix from upstream for ccnoco test failure with custom LDFLAGS #203914
+  by Carsten Lohrke.
 
 *automake-1.11 (17 May 2009)
 
diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild
index 23bba650bc1b..fdc9fbf6ad92 100644
--- a/sys-devel/automake/automake-1.5.ebuild
+++ b/sys-devel/automake/automake-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.30 2008/11/23 14:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.31 2009/05/29 23:41:11 vapier Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-target_hook.patch
 	epatch "${FILESDIR}"/${P}-slot.patch
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
diff --git a/sys-devel/automake/automake-1.6.3.ebuild b/sys-devel/automake/automake-1.6.3.ebuild
index 7baf02553416..fca1848d3539 100644
--- a/sys-devel/automake/automake-1.6.3.ebuild
+++ b/sys-devel/automake/automake-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.39 2008/11/23 14:56:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.40 2009/05/29 23:41:10 vapier Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.7.9-r1.ebuild b/sys-devel/automake/automake-1.7.9-r1.ebuild
index 11420f6bb4f3..5867e7baa280 100644
--- a/sys-devel/automake/automake-1.7.9-r1.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.18 2009/03/21 11:40:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.19 2009/05/29 23:41:11 vapier Exp $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-test-fixes.patch
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
 	epatch "${FILESDIR}"/${P}-libtool-2.patch #257544
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.8.5-r3.ebuild b/sys-devel/automake/automake-1.8.5-r3.ebuild
index fd4e494b51d1..3727618ae0fb 100644
--- a/sys-devel/automake/automake-1.8.5-r3.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.18 2009/03/21 11:39:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.19 2009/05/29 23:41:11 vapier Exp $
 
 inherit eutils
 
@@ -30,6 +30,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
 	epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.9.6-r2.ebuild b/sys-devel/automake/automake-1.9.6-r2.ebuild
index 2ec9a7eae1fe..4a7b91529756 100644
--- a/sys-devel/automake/automake-1.9.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.19 2009/03/21 11:39:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r2.ebuild,v 1.20 2009/05/29 23:41:10 vapier Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
 	epatch "${FILESDIR}"/${P}-aclocal7-test-sleep.patch #197366
 	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch b/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch
new file mode 100644
index 000000000000..f48c6304bdc2
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.10-ccnoco-ldflags.patch
@@ -0,0 +1,35 @@
+http://bugs.gentoo.org/203914
+
+From 6e86514729c6dccb6213fdde8d93d7061c8108a5 Mon Sep 17 00:00:00 2001
+From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date: Mon, 7 Jan 2008 21:53:38 +0100
+Subject: [PATCH] Fix ccnoco.test for uncommon LDFLAGS settings.
+
+* tests/ccnoco.test (Mycomp): Use a tighter match for -c -o,
+to avoid matching for example `LDFLAGS=-Wl,--sort-common'.
+* THANKS: Update.
+Report and analysis by Carsten Lohrke and Mike Frysinger.
+---
+ ChangeLog         |    7 +++++++
+ THANKS            |    1 +
+ tests/ccnoco.test |    6 +++---
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/tests/ccnoco.test b/tests/ccnoco.test
+index 8b37fe8..ca75922 100755
+--- a/tests/ccnoco.test
++++ b/tests/ccnoco.test
+@@ -57,8 +57,8 @@ END
+ cat > Mycomp << 'END'
+ #!/bin/sh
+ 
+-case "$@" in
+- *-c*-o* | *-o*-c*)
++case " "$* in
++ *\ -c*\ -o* | *\ -o*\ -c*)
+     exit 1
+     ;;
+ esac
+-- 
+1.6.3
+