From cfbe51dabc2a37e0180aec36fc18e6c2195f8d21 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Mon, 5 Jun 2006 08:56:59 +0000 Subject: [PATCH] Fix compilation with parallel make, bug #135521. Package-Manager: portage-2.0.54-r2 --- sys-power/cpufrequtils/ChangeLog | 6 +++++- sys-power/cpufrequtils/Manifest | 5 +++-- sys-power/cpufrequtils/cpufrequtils-002.ebuild | 11 +++++++++-- .../files/cpufrequtils-002-parallel-make.patch | 12 ++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 sys-power/cpufrequtils/files/cpufrequtils-002-parallel-make.patch diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog index e2a83f814b8a..59e4d6e46836 100644 --- a/sys-power/cpufrequtils/ChangeLog +++ b/sys-power/cpufrequtils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/cpufrequtils # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.23 2006/06/01 12:02:01 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.24 2006/06/05 08:56:59 brix Exp $ + + 05 Jun 2006; Henrik Brix Andersen + +files/cpufrequtils-002-parallel-make.patch, cpufrequtils-002.ebuild: + Fix compilation with parallel make, bug #135521. *cpufrequtils-002 (01 Jun 2006) diff --git a/sys-power/cpufrequtils/Manifest b/sys-power/cpufrequtils/Manifest index 1dc2c1b99fd2..ec18c23b3b38 100644 --- a/sys-power/cpufrequtils/Manifest +++ b/sys-power/cpufrequtils/Manifest @@ -1,13 +1,14 @@ -MD5 cfbf11e09c0dd09544675e6debcc0d44 ChangeLog 3686 +MD5 728cda77fdaf38f58da6c711f64a58ef ChangeLog 3864 MD5 807a7ffb13cf26d5259c3ef3e2e59996 cpufrequtils-0.4.ebuild 987 MD5 14ab7af6c60913f5d0403bfbddd3f586 cpufrequtils-001.ebuild 1241 -MD5 308e8d73160e11e3f20e516ec4d638a9 cpufrequtils-002.ebuild 1117 +MD5 0532996c01c983c521314c311c379a81 cpufrequtils-002.ebuild 1210 MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-0.4-conf.d 230 MD5 b8286b5cd3a2b122ace8f1a66c08fd67 files/cpufrequtils-0.4-init.d 498 MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-001-conf.d 230 MD5 b68d94133a48be4c8c9d274a4941b3ae files/cpufrequtils-001-init.d 496 MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-002-conf.d 230 MD5 297490bc478b653dbde74af15771de10 files/cpufrequtils-002-init.d 618 +MD5 ec29a9a54ad27491e0e26ef277c13441 files/cpufrequtils-002-parallel-make.patch 580 MD5 555ad680b73f0cd099e9c2e81d24cf9b files/digest-cpufrequtils-0.4 69 MD5 706022fe8ddcdddc2bf9a140c6a48d23 files/digest-cpufrequtils-001 68 MD5 0073e9b2090ae842a6fd4c4396f1fd4e files/digest-cpufrequtils-002 68 diff --git a/sys-power/cpufrequtils/cpufrequtils-002.ebuild b/sys-power/cpufrequtils/cpufrequtils-002.ebuild index 4866704aeda5..0646db48a3b0 100644 --- a/sys-power/cpufrequtils/cpufrequtils-002.ebuild +++ b/sys-power/cpufrequtils/cpufrequtils-002.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-002.ebuild,v 1.1 2006/06/01 12:02:01 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/cpufrequtils-002.ebuild,v 1.2 2006/06/05 08:56:59 brix Exp $ -inherit toolchain-funcs multilib +inherit eutils toolchain-funcs multilib DESCRIPTION="Userspace utilities for the Linux kernel cpufreq subsystem" HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" @@ -15,6 +15,13 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="debug nls" DEPEND="sys-fs/sysfsutils" +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-parallel-make.patch +} + src_compile() { local debug=false nls=false diff --git a/sys-power/cpufrequtils/files/cpufrequtils-002-parallel-make.patch b/sys-power/cpufrequtils/files/cpufrequtils-002-parallel-make.patch new file mode 100644 index 000000000000..5f92fa18e633 --- /dev/null +++ b/sys-power/cpufrequtils/files/cpufrequtils-002-parallel-make.patch @@ -0,0 +1,12 @@ +diff -urp cpufrequtils-002/Makefile cpufrequtils-002-parallel-make/Makefile +--- cpufrequtils-002/Makefile 2006-06-01 10:54:41.000000000 +0200 ++++ cpufrequtils-002-parallel-make/Makefile 2006-06-05 00:14:53.000000000 +0200 +@@ -189,7 +189,7 @@ libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS + + libcpufreq: libcpufreq.la + +-cpufreq-%: $(UTIL_OBJS) ++cpufreq-%: libcpufreq.la $(UTIL_OBJS) + $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I. -I./lib/ -c -o utils/$@.o utils/$*.c + $(QUIET) $(CC) $(CFLAGDEF) $(CFLAGS) -g -I./lib/ -L. -L./.libs/ -lcpufreq -o $@ utils/$@.o + $(QUIET) $(STRIPCMD) $@ -- 2.26.2