summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-04-14 17:46:17 +0000
committerTim Harder <radhermit@gentoo.org>2012-04-14 17:46:17 +0000
commit5505cb0b9f96f6e9f2775fc322dd2c60653476cc (patch)
tree5aec5ca3346aade05699209fccb9dddd062c73ed /dev-libs/cdk
parentUpdate to use xorg-2 eclass. (diff)
downloadgentoo-2-5505cb0b9f96f6e9f2775fc322dd2c60653476cc.tar.gz
gentoo-2-5505cb0b9f96f6e9f2775fc322dd2c60653476cc.tar.bz2
gentoo-2-5505cb0b9f96f6e9f2775fc322dd2c60653476cc.zip
Fix parallel make failure (bug #411879, patch by Nathan Phillip Brink).
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/cdk')
-rw-r--r--dev-libs/cdk/ChangeLog6
-rw-r--r--dev-libs/cdk/cdk-5.0.20120323.ebuild5
-rw-r--r--dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch12
3 files changed, 20 insertions, 3 deletions
diff --git a/dev-libs/cdk/ChangeLog b/dev-libs/cdk/ChangeLog
index e6d064950e70..ce955107c79e 100644
--- a/dev-libs/cdk/ChangeLog
+++ b/dev-libs/cdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/cdk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/ChangeLog,v 1.73 2012/03/25 23:40:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/ChangeLog,v 1.74 2012/04/14 17:46:17 radhermit Exp $
+
+ 14 Apr 2012; Tim Harder <radhermit@gentoo.org> cdk-5.0.20120323.ebuild,
+ +files/cdk-5.0.20120323-parallel-make.patch:
+ Fix parallel make failure (bug #411879, patch by Nathan Phillip Brink).
*cdk-5.0.20120323 (25 Mar 2012)
diff --git a/dev-libs/cdk/cdk-5.0.20120323.ebuild b/dev-libs/cdk/cdk-5.0.20120323.ebuild
index f9cd17db0687..3f0359436305 100644
--- a/dev-libs/cdk/cdk-5.0.20120323.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20120323.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20120323.ebuild,v 1.1 2012/03/25 23:40:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20120323.ebuild,v 1.2 2012/04/14 17:46:17 radhermit Exp $
EAPI=4
@@ -23,7 +23,8 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${P}-ldflags.patch \
- "${FILESDIR}"/${PN}-5.0.20110517-makefile.patch
+ "${FILESDIR}"/${PN}-5.0.20110517-makefile.patch \
+ "${FILESDIR}"/${P}-parallel-make.patch
}
src_configure() {
diff --git a/dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch b/dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch
new file mode 100644
index 000000000000..aa5a1dce04e7
--- /dev/null
+++ b/dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -269,7 +269,7 @@
+
+ all sources :: $(AUTO_SRC)
+
+-$(OBJECTS) : include/cdk_config.h
++$(OBJECTS) : $(MY_HDR)
+
+ #
+ # Standard library directive.
+