dev-util/oprofile: fix build with gcc12

Patch by Sergei Trofimovich <[email protected]> from oprofile mail lists. Package-Manager: Portage-3.0.29, Repoman-3.0.3 Signed-off-by: Andrew Savchenko <[email protected]>
hanetzer · Dec 9, 2021 · 378d17f · 378d17f
1 parent c9ab1c9
commit 378d17f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/dev-util/oprofile/files/gcc12.patch b/dev-util/oprofile/files/gcc12.patch
@@ -0,0 +1,27 @@
+`gcc-12` will forbid std::string(nullptr_t) constructors
+(as they never had a defined behaviour):
+
+ operf_stats.cpp:182:24: error: use of deleted function 'std::__cxx11::basic_string...; std::nullptr_t = std::nullptr_t]'
+ 182 | return NULL;
+ | ^~~~
+
+Signed-off-by: Sergei Trofimovich <[email protected]>
+---
+ libperf_events/operf_stats.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libperf_events/operf_stats.cpp b/libperf_events/operf_stats.cpp
+index 3cc28a75..a7bd0aec 100644
+--- a/libperf_events/operf_stats.cpp
++++ b/libperf_events/operf_stats.cpp
+@@ -179,7 +179,7 @@ static string create_stats_dir(string const & cur_sampledir)
+ if (rc && (errno != EEXIST)) {
+ cerr << "Error trying to create stats dir. " << endl;
+ perror("mkdir failed with");
+- return NULL;
++ return "";
+ }
+ return stats_dir;
+ }
+-- 
+2.33.1
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -47,6 +47,7 @@ pkg_setup() {
 
 src_prepare() {
  eapply "${FILESDIR}/musl.patch"
+ eapply "${FILESDIR}/gcc12.patch"
  # bug 723092
  sed -i 's/==/=/g' configure.ac || die