rpms/kernel/F-13 kernel.spec,1.2026,1.2027

Kyle McMartin kyle at fedoraproject.org
Mon May 10 19:35:42 UTC 2010


Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22010

Modified Files:
	kernel.spec 
Log Message:
* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
- don't link binutils against perf. sigh. stupid gpl versions.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -p -r1.2026 -r1.2027
--- kernel.spec	10 May 2010 16:57:21 -0000	1.2026
+++ kernel.spec	10 May 2010 19:35:41 -0000	1.2027
@@ -536,7 +536,7 @@ BuildRequires: xmlto, asciidoc
 BuildRequires: sparse >= 0.4.1
 %endif
 %if %{with_perftool}
-BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel binutils-static libdwarf-devel
+BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel libdwarf-devel
 %endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
@@ -1670,7 +1670,7 @@ BuildKernel() {
     pushd tools/perf
 # make sure the scripts are executable... won't be in tarball until 2.6.31 :/
     chmod +x util/generate-cmdlist.sh util/PERF-VERSION-GEN
-    make -s V=1 %{?_smp_mflags} perf
+    make -s V=1 NO_DEMANGLE=1 %{?_smp_mflags} perf
     mkdir -p $RPM_BUILD_ROOT/usr/libexec/
     install -m 755 perf $RPM_BUILD_ROOT/usr/libexec/perf.$KernelVer
     popd
@@ -2205,6 +2205,9 @@ fi
 # and build.
 
 %changelog
+* Mon May 10 2010 Kyle McMartin <kyle at redhat.com>
+- don't link binutils against perf. sigh. stupid gpl versions.
+
 * Mon May 10 2010 Eric Paris <eparis at redhat.com>
 - reduce size of selinux poliy memory allocation (rhbz#590363)
 



More information about the scm-commits mailing list