diff --git a/oprofile-0.9.6-gcc46.patch b/oprofile-0.9.6-gcc46.patch new file mode 100644 index 0000000..78670a0 --- /dev/null +++ b/oprofile-0.9.6-gcc46.patch @@ -0,0 +1,22 @@ +From: Ismail Doenmez +Subject: Fix compilation with gcc 4.6 +Date: 09.03.2011 +References: N/A +Upstream: yes +Signed-Off-by: William Cohen + +Do not use mutable for reference variable. +Upstream commit id: b18f60db60487ada38d5f04f52981628b28c6835 + +diff -up oprofile-0.9.6/libpp/format_output.h.mutable oprofile-0.9.6/libpp/format_output.h +--- oprofile-0.9.6/libpp/format_output.h.mutable 2011-02-09 10:20:29.598713997 -0500 ++++ oprofile-0.9.6/libpp/format_output.h 2011-02-09 11:39:48.504714000 -0500 +@@ -91,7 +91,7 @@ protected: + symbol_entry const & symbol; + sample_entry const & sample; + size_t pclass; +- mutable counts_t & counts; ++ counts_t & counts; + extra_images const & extra; + double diff; + }; diff --git a/oprofile.changes b/oprofile.changes index e58ceba..6d15b6b 100644 --- a/oprofile.changes +++ b/oprofile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 3 03:02:55 UTC 2011 - idoenmez@novell.com + +- Add oprofile-0.9.6-gcc46.patch to fix compilation with gcc 4.6 + ------------------------------------------------------------------- Thu Apr 28 18:33:19 UTC 2011 - tonyj@novell.com diff --git a/oprofile.spec b/oprofile.spec index 1a69c63..18fb85a 100644 --- a/oprofile.spec +++ b/oprofile.spec @@ -37,6 +37,7 @@ Source5: README-BEFORE-ADDING-PATCHES Patch1: oprofile-0.9.5-buildfixes.diff Patch2: oprofile-0.9.4-fixes.diff Patch3: oprofile-qt4.diff +Patch4: oprofile-0.9.6-gcc46.patch %description OProfile is a system-wide profiler for Linux systems, capable of @@ -93,6 +94,7 @@ from supported virtual machines. %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 mkdir -p java/include # copy files necessary to build Java agent libraries # libjvmpi_oprofile.so and libjvmti_oprofile.so