summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-10-16 07:21:51 +0000
committerMike Frysinger <vapier@gentoo.org>2009-10-16 07:21:51 +0000
commitf513fd10b9f3cb5e19afb4699b8fd464219959a5 (patch)
tree0a402f4e03d82414a42d15e336cff6c2cd3c3f5c /sys-apps
parentversion bump (diff)
downloadgentoo-2-f513fd10b9f3cb5e19afb4699b8fd464219959a5.tar.gz
gentoo-2-f513fd10b9f3cb5e19afb4699b8fd464219959a5.tar.bz2
gentoo-2-f513fd10b9f3cb5e19afb4699b8fd464219959a5.zip
Workaround parallel build issues #289264.
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/openrc/ChangeLog6
-rw-r--r--sys-apps/openrc/openrc-0.5.1-r1.ebuild3
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index ad575aa25f90..d1133f19ed1d 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.83 2009/10/16 03:37:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.84 2009/10/16 07:21:51 vapier Exp $
+
+ 16 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
+ openrc-9999.ebuild:
+ Workaround parallel build issues #289264.
16 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
openrc-9999.ebuild:
diff --git a/sys-apps/openrc/openrc-0.5.1-r1.ebuild b/sys-apps/openrc/openrc-0.5.1-r1.ebuild
index b2a266e0ea36..faa68c57744c 100644
--- a/sys-apps/openrc/openrc-0.5.1-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.5.1-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-apps/openrc/openrc-0.5.1-r1.ebuild,v 1.3 2009/10/16 03:37:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.1-r1.ebuild,v 1.4 2009/10/16 07:21:51 vapier Exp $
EAPI="1"
@@ -67,6 +67,7 @@ src_unpack() {
cd "${S}"
sed -i 's:0444:0644:' mk/sys.mk
sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
+ sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
[[ -d ${FILESDIR}/${PV} ]] \
&& epatch "${FILESDIR}"/${PV}/*.patch \
|| epatch "${FILESDIR}"/9999/*.patch
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 134abd9a057b..64d3a4d22639 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.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-apps/openrc/openrc-9999.ebuild,v 1.57 2009/10/16 03:37:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.58 2009/10/16 07:21:51 vapier Exp $
EAPI="1"
@@ -67,6 +67,7 @@ src_unpack() {
cd "${S}"
sed -i 's:0444:0644:' mk/sys.mk
sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
+ sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
[[ -d ${FILESDIR}/${PV} ]] \
&& epatch "${FILESDIR}"/${PV}/*.patch \
|| epatch "${FILESDIR}"/9999/*.patch