summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-05-28 05:58:16 +0000
committerPeter Volkov <pva@gentoo.org>2010-05-28 05:58:16 +0000
commit7c0a4ae868229c105c30846313dedcec35934eb1 (patch)
treecf5ebcb8c2d72c0fea6359d017a4a0ac57cef4ed /net-dialup
parent[media-sound/amarok] Bumped to the 2.3.1 release. (diff)
downloadgentoo-2-7c0a4ae868229c105c30846313dedcec35934eb1.tar.gz
gentoo-2-7c0a4ae868229c105c30846313dedcec35934eb1.tar.bz2
gentoo-2-7c0a4ae868229c105c30846313dedcec35934eb1.zip
Fixed build issue, bug #321729, thank Willard Dawson for report and Samuli Suominen, Lars Wendler (Polynomial-C) for this fix.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/wvdial/ChangeLog7
-rw-r--r--net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch20
-rw-r--r--net-dialup/wvdial/wvdial-1.61.ebuild5
3 files changed, 29 insertions, 3 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/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() {