rpms/cpufrequtils/devel cpufrequtils-fix-parallel-build-of-ccdv.patch, NONE, 1.1 cpufrequtils.spec, 1.5, 1.6

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/cpufrequtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13748

Modified Files:
	cpufrequtils.spec 
Added Files:
	cpufrequtils-fix-parallel-build-of-ccdv.patch 
Log Message:
* Fri Aug 15 2008 Jarod Wilson <jarod at redhat.com> 005-2
- Fix parallel build


cpufrequtils-fix-parallel-build-of-ccdv.patch:

--- NEW FILE cpufrequtils-fix-parallel-build-of-ccdv.patch ---
From: Olivier Blin <blino at mandriva.com>
To: cpufreq at vger.kernel.org
Cc: Olivier Blin <blino at mandriva.com>
Subject: [PATCH] fix parallel build of ccdv in cpufrequtils
Date: 	Wed, 13 Aug 2008 22:31:49 +0200

Parallel build was broken because ccdv was not necessarily built
before the object files were built (occured with make -j4).

Signed-off-by: Olivier Blin <blino at mandriva.com>
---
 Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fd9f41f..c46be5b 100644
--- a/Makefile
+++ b/Makefile
@@ -171,11 +171,12 @@ endif
 
 all: ccdv libcpufreq utils $(COMPILE_NLS)
 
-ccdv:
+ccdv: build/ccdv
+build/ccdv: build/ccdv.c
 	@echo "Building ccdv"
-	@$(HOSTCC) -O1 build/ccdv.c -o build/ccdv
+	@$(HOSTCC) -O1  -O1 $< -o $@
 
-%.lo: $(LIB_OBJS) $(LIB_HEADERS)
+%.lo: $(LIB_OBJS) $(LIB_HEADERS) ccdv
 	$(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=compile $(CC) $(CFLAGDEF) $(CFLAGS) -o $@ -c $*.c
 
 libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS) $(LIB_PARTS) Makefile


Index: cpufrequtils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpufrequtils/devel/cpufrequtils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpufrequtils.spec	11 Aug 2008 03:20:27 -0000	1.5
+++ cpufrequtils.spec	15 Aug 2008 21:19:35 -0000	1.6
@@ -1,12 +1,13 @@
 Summary:        CPU Frequency changing related utilities
 Name:           cpufrequtils
 Version:        005
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 Source:         http://www.kernel.org/pub/linux/utils/kernel/cpufreq/%{name}-%{version}.tar.bz2
 Patch0:         disable-gsic.patch
+Patch1:         cpufrequtils-fix-parallel-build-of-ccdv.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libsysfs-devel gettext
 # pulls in automake and autoconf
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -85,6 +87,9 @@
 
 
 %changelog
+* Fri Aug 15 2008 Jarod Wilson <jarod at redhat.com> 005-2
+- Fix parallel build
+
 * Sun Aug 10 2008 Jarod Wilson <jwilson at redhat.com> 005-1
 - New upstream release