Fixed build issue, bug #321729, thank Willard Dawson for report and Samuli Suominen, Lars Wendler (Polynomial-C) for this fix.

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

4 files changed, 32 insertions, 5 deletions

diff --git a/net-dialup/wvdial/ChangeLog b/net-dialup/wvdial/ChangeLog
index 607903be79fd..1135a1a21ae8 100644
--- a/net-dialup/wvdial/ChangeLog
+++ b/net-dialup/wvdial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/wvdial
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/ChangeLog,v 1.56 2010/05/27 13:47:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/ChangeLog,v 1.57 2010/05/28 05:58:16 pva Exp $
+
+  28 May 2010; Peter Volkov <pva@gentoo.org> wvdial-1.61.ebuild,
+  +files/wvdial-1.61-parallel-make.patch:
+  Fixed build issue, bug #321729, thank Willard Dawson for report and Samuli
+  Suominen, Lars Wendler (Polynomial-C) for this fix.
 
 *wvdial-1.61 (27 May 2010)
 
diff --git a/net-dialup/wvdial/Manifest b/net-dialup/wvdial/Manifest
index e3a3202a05bf..61e45bdb4894 100644
--- a/net-dialup/wvdial/Manifest
+++ b/net-dialup/wvdial/Manifest
@@ -3,10 +3,11 @@ AUX wvdial-1.60-destdir.patch 455 RMD160 64974f8a7acc673e2869734e10096830ff2ba46
 AUX wvdial-1.60-dirent.patch 714 RMD160 8cef3b42dbbbbae4bf98703e8857bf2002d95e2f SHA1 dbce3651f63508f8b856b22ad876eaa4d91ed618 SHA256 7d9251eb1de40599979942452b530a5f13c9920135ebdc2b091435a64aedeb9c
 AUX wvdial-1.61-as-needed.patch 380 RMD160 cd0c3c5247edc64d2ac632f5d9bf8dd8ecbc4f03 SHA1 dc868ef8c185ff26b8cfd1b7967c294b6ecaac92 SHA256 87c2b863505acad847b93608c1aa242f4b262327fae6bb40eaaa5e53ff11f5f0
 AUX wvdial-1.61-destdir.patch 774 RMD160 4724c656d90e5403865ac983ad0feec781abc0ed SHA1 2c2bb42509fd76e6a151f23c7a4a32a5bc7d16ee SHA256 6522f9edad4deeaaf91c967c9212ab573fc3e423e636e84f146b23fe5d61f827
+AUX wvdial-1.61-parallel-make.patch 617 RMD160 76362e2fdefa185065b1270f06ce3e9964caf38b SHA1 ac1a0b95e5dab2086df6fe6950d81a41e7fdba5c SHA256 b4e6538c2e1a83203700ae36cd5a44a8ffc8a3ffee34b1f9bd1ea2689df9b8de
 DIST wvdial-1.60.tar.gz 100264 RMD160 3e8f46cf81082bb7c829e530b3f9922ff00de9c1 SHA1 d44914065258d316cff28494d4409cd27a07cfa6 SHA256 0c65ea807950fab32e659d1869a7167ff978502bd5d0159dbe9de90eb6c2e16b
 DIST wvdial-1.61.tar.gz 94854 RMD160 ac16a09f9f039bb79a7c05f4f910cbcd1f316cd6 SHA1 2878cae3aaf067989eebc7313ccd2cec59893345 SHA256 4fffab9652c760199c074533d1d3929bea55ab4233b11e735b0f1856d1ceec57
 EBUILD wvdial-1.60-r1.ebuild 1076 RMD160 a622e13934c3ec67b36504fef7ed8413111a8ade SHA1 418778e9bb51d05f991d5004a2636f0ce4608ec8 SHA256 dd10fff2946c3a46406ab77cd093535aa55bc3a4e280e88158c3568dacc1a0da
 EBUILD wvdial-1.60.ebuild 1047 RMD160 11bb6057a485f8e51a822b6049a84ed27e7d26c8 SHA1 7f5b45baa9a255e22c19b55ba8a2dff3170cafb4 SHA256 297361b51342c696c0d032dfdfd6107ce6d389b21fa4108f3df63b9959d3f8c6
-EBUILD wvdial-1.61.ebuild 1121 RMD160 9208a2b8cb5d4518c75067e63a510c0c1185ae18 SHA1 8e3c34db7307c3476648e467ac78f9103602ddb7 SHA256 6e472e012e7bed3c5d7139e09ce0d6d16d540306f0a2aba15c5a4a0b4291327c
-MISC ChangeLog 7358 RMD160 ee8ed49e8c69d6f2b1a4a408cff0b6818e67498a SHA1 e0819ee09adc5ec34c0b7bf609e74448b6a5b6f2 SHA256 b7fee8902d4d0542591e95cf771c6853db572f8616644c08f6ec679ae0904838
+EBUILD wvdial-1.61.ebuild 1162 RMD160 c12403e4d94bf0aaa9c367006616fd00c3146daa SHA1 ac71f07812e2a9d163bcb8b4d03c3afdad739aaf SHA256 9e5db290afb382aa90c1ccd063e79cf0a67b8b42b0a8b68cfee95cabf4a0925e
+MISC ChangeLog 7597 RMD160 45b43c03fa445a1fa62d9ba08a489e54fd84fb71 SHA1 55cd979221305c24a8221d8a64963ed8ea5f4d25 SHA256 beb897f025b12a7a948f6358037e2a3ba83eb86e7e2b8995692e5201d526866e
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
diff --git a/net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch b/net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch
new file mode 100644
index 000000000000..4c0c83709dd0
--- /dev/null
+++ b/net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch
@@ -0,0 +1,20 @@
+--- wvdial-1.61/wvrules-posix.mk
++++ wvdial-1.61/wvrules-posix.mk
+@@ -85,12 +85,15 @@
+ 	$(AR) s $1
+ endef
+ 
+-CC: FORCE
++CC:
+ 	@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS_SRC)/gen-cc CC c
+ 
+-CXX: FORCE
++CXX:
+ 	@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ 	  $(WVSTREAMS_SRC)/gen-cc CXX cc
+ 
++#All files must depend on the above two rules. This is a godawful hack.
++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
++
+ wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/net-dialup/wvdial/wvdial-1.61.ebuild b/net-dialup/wvdial/wvdial-1.61.ebuild
index 88f36a9a5527..2dfdc1e472e9 100644
--- a/net-dialup/wvdial/wvdial-1.61.ebuild
+++ b/net-dialup/wvdial/wvdial-1.61.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/wvdial-1.61.ebuild,v 1.1 2010/05/27 13:47:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/wvdial-1.61.ebuild,v 1.2 2010/05/28 05:58:16 pva Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE=""
 
 COMMON_DEPEND=">=net-libs/wvstreams-4.4"
@@ -24,6 +24,7 @@ RDEPEND="${COMMON_DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}/${P}-destdir.patch"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
 }
 
 src_configure() {