diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-12-19 22:46:51 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-19 22:46:51 +0000 |
commit | 8cc27e43399cf9b6949c52eb0805df30c5378df2 (patch) | |
tree | c5ab02f1ea2bc002a69a483e2937b2f934111e89 /sys-power/apcupsd | |
parent | fix dbus check as per bug #158413 (diff) | |
download | gentoo-2-8cc27e43399cf9b6949c52eb0805df30c5378df2.tar.gz gentoo-2-8cc27e43399cf9b6949c52eb0805df30c5378df2.tar.bz2 gentoo-2-8cc27e43399cf9b6949c52eb0805df30c5378df2.zip |
Backport parallel-build disable change from upstream #156980.
(Portage version: 2.1.2_rc3-r5)
Diffstat (limited to 'sys-power/apcupsd')
-rw-r--r-- | sys-power/apcupsd/ChangeLog | 6 | ||||
-rw-r--r-- | sys-power/apcupsd/apcupsd-3.12.4.ebuild | 3 | ||||
-rw-r--r-- | sys-power/apcupsd/files/3.12.4/no-parallel.patch | 13 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog index 0743de242b84..dc4dba79d60e 100644 --- a/sys-power/apcupsd/ChangeLog +++ b/sys-power/apcupsd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/apcupsd # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.23 2006/12/19 22:19:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.24 2006/12/19 22:46:51 vapier Exp $ + + 19 Dec 2006; Mike Frysinger <vapier@gentoo.org> + +files/3.12.4/no-parallel.patch, apcupsd-3.12.4.ebuild: + Backport parallel-build disable change from upstream #156980. 19 Dec 2006; Mike Frysinger <vapier@gentoo.org> files/3.12.4/apcupsd.in.patch, files/3.12.4/etc.patch, diff --git a/sys-power/apcupsd/apcupsd-3.12.4.ebuild b/sys-power/apcupsd/apcupsd-3.12.4.ebuild index 8bad2ca506ee..d02bb4bde6c4 100644 --- a/sys-power/apcupsd/apcupsd-3.12.4.ebuild +++ b/sys-power/apcupsd/apcupsd-3.12.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.4 2006/12/19 22:19:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.4.ebuild,v 1.5 2006/12/19 22:46:51 vapier Exp $ WEBAPP_MANUAL_SLOT="yes" inherit eutils webapp @@ -33,6 +33,7 @@ src_unpack() { epatch "${FILESDIR}"/${PV}/etc.patch epatch "${FILESDIR}"/${PV}/exit-status-build.patch epatch "${FILESDIR}"/${PV}/no-strip.patch + epatch "${FILESDIR}"/${PV}/no-parallel.patch } src_compile() { diff --git a/sys-power/apcupsd/files/3.12.4/no-parallel.patch b/sys-power/apcupsd/files/3.12.4/no-parallel.patch new file mode 100644 index 000000000000..a2aa4c398d1c --- /dev/null +++ b/sys-power/apcupsd/files/3.12.4/no-parallel.patch @@ -0,0 +1,13 @@ +upstream forces this cruft + +--- autoconf/targets.mak ++++ autoconf/targets.mak +@@ -5,6 +5,8 @@ + # + # Copyright (C) 1999-2002 Riccardo Facchetti <riccardo@master.oasi.gpa.it> + ++.NOTPARALLEL: ++ + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |