rpms/kernel/F-12 kernel.spec,1.1868,1.1869

[roland]

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3494

Modified Files:
	kernel.spec 
Log Message:
* Wed Oct 14 2009 Roland McGrath <roland at redhat.com> 2.6.31.4-83
- Remove work-around for gcc bug #521991, now fixed.
- Build *docs non-parallel, working around kernel's makefile bugs.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1868
retrieving revision 1.1869
diff -u -p -r1.1868 -r1.1869
--- kernel.spec	14 Oct 2009 19:25:43 -0000	1.1868
+++ kernel.spec	14 Oct 2009 21:45:33 -0000	1.1869
@@ -1497,11 +1497,6 @@ BuildKernel() {
     # make sure EXTRAVERSION says what we want it to say
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
 
-    cat >> Makefile <<\EOF
-# XXX temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=521991
-KBUILD_CFLAGS += $(call cc-option,-fno-var-tracking-assignments)
-EOF
-
     # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme
     %if !0%{?rcrev}
     %if 0%{?gitrev}
@@ -1728,7 +1723,8 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 
 %if %{with_doc}
 # Make the HTML and man pages.
-make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
+# XXX nix %{?_smp_mflags} here, buggy Documentation/*/Makefile!
+make htmldocs mandocs || %{doc_build_fail}
 
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
@@ -2061,6 +2057,10 @@ fi
 # and build.
 
 %changelog
+* Wed Oct 14 2009 Roland McGrath <roland at redhat.com> 2.6.31.4-83
+- Remove work-around for gcc bug #521991, now fixed.
+- Build *docs non-parallel, working around kernel's makefile bugs.
+
 * Wed Oct 14 2009 Peter Jones <pjones at redhat.com>
 - Add scsi_register_device_handler to modules.block's symbol list so
   we'll have scsi device handlers in installer images.