From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B9BA158086 for ; Thu, 9 Dec 2021 21:08:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1A4B2F4001; Thu, 9 Dec 2021 21:08:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 608E42F4001 for ; Thu, 9 Dec 2021 21:08:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22F193431BF for ; Thu, 9 Dec 2021 21:08:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7D5E1F2 for ; Thu, 9 Dec 2021 21:08:47 +0000 (UTC) From: "Andrew Savchenko" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Savchenko" Message-ID: <1639084117.378d17fe2ce3bbace6a650c64fe73481d08986fe.bircoph@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/files/, dev-util/oprofile/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/oprofile/files/gcc12.patch dev-util/oprofile/oprofile-1.4.0.ebuild X-VCS-Directories: dev-util/oprofile/files/ dev-util/oprofile/ X-VCS-Committer: bircoph X-VCS-Committer-Name: Andrew Savchenko X-VCS-Revision: 378d17fe2ce3bbace6a650c64fe73481d08986fe X-VCS-Branch: master Date: Thu, 9 Dec 2021 21:08:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6603d6dc-52d0-478e-aaaf-f318f166c5fe X-Archives-Hash: edcc44764835d960bce2bedff4aa6194 commit: 378d17fe2ce3bbace6a650c64fe73481d08986fe Author: Andrew Savchenko gentoo org> AuthorDate: Thu Dec 9 21:08:05 2021 +0000 Commit: Andrew Savchenko gentoo org> CommitDate: Thu Dec 9 21:08:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378d17fe dev-util/oprofile: fix build with gcc12 Patch by Sergei Trofimovich gmail.com> from oprofile mail lists. Package-Manager: Portage-3.0.29, Repoman-3.0.3 Signed-off-by: Andrew Savchenko gentoo.org> dev-util/oprofile/files/gcc12.patch | 27 +++++++++++++++++++++++++++ dev-util/oprofile/oprofile-1.4.0.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/dev-util/oprofile/files/gcc12.patch b/dev-util/oprofile/files/gcc12.patch new file mode 100644 index 000000000000..96f56d6a7ea7 --- /dev/null +++ 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 +--- + 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 index 2526034bec1b..8c623f03696c 100644 --- 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