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 CC6EA15ACFB for ; Sat, 15 Apr 2023 05:13:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 135FAE07BA; Sat, 15 Apr 2023 05:13:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id EC58AE07BA for ; Sat, 15 Apr 2023 05:13:21 +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 25F06340834 for ; Sat, 15 Apr 2023 05:13:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E94B909 for ; Sat, 15 Apr 2023 05:13:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1681535481.d1a3661d06ab2036402024ea792bad26b7eb2cda.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/files/, dev-util/perf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/perf/files/perf-6.0-c++17.patch dev-util/perf/perf-6.0-r1.ebuild dev-util/perf/perf-6.2-r1.ebuild X-VCS-Directories: dev-util/perf/ dev-util/perf/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d1a3661d06ab2036402024ea792bad26b7eb2cda X-VCS-Branch: master Date: Sat, 15 Apr 2023 05:13:19 +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: 130f4dab-7374-4e4f-9803-e86171a0a22a X-Archives-Hash: c339662153ca03da62ded1871042f12f commit: d1a3661d06ab2036402024ea792bad26b7eb2cda Author: Sam James gentoo org> AuthorDate: Sat Apr 15 05:11:21 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 15 05:11:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a3661d dev-util/perf: fix build w/ clang 16 Closes: https://bugs.gentoo.org/904169 Thanks-to: Maciej S. Szmigiero maciej.szmigiero.name> Signed-off-by: Sam James gentoo.org> dev-util/perf/files/perf-6.0-c++17.patch | 39 ++++++++++++++++++++++++++++++++ dev-util/perf/perf-6.0-r1.ebuild | 1 + dev-util/perf/perf-6.2-r1.ebuild | 1 + 3 files changed, 41 insertions(+) diff --git a/dev-util/perf/files/perf-6.0-c++17.patch b/dev-util/perf/files/perf-6.0-c++17.patch new file mode 100644 index 000000000000..08c34bc552ca --- /dev/null +++ b/dev-util/perf/files/perf-6.0-c++17.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/904169 +--- a/tools/perf/Makefile.config ++++ b/tools/perf/Makefile.config +@@ -309,7 +309,7 @@ + CORE_CFLAGS += -Wextra + CORE_CFLAGS += -std=gnu11 + +-CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti ++CXXFLAGS += -std=gnu++17 -fno-exceptions -fno-rtti + CXXFLAGS += -Wall + CXXFLAGS += -fno-omit-frame-pointer + CXXFLAGS += -ggdb3 +--- a/tools/build/feature/Makefile ++++ b/tools/build/feature/Makefile +@@ -339,7 +339,7 @@ + $(BUILD) + + $(OUTPUT)test-llvm.bin: +- $(BUILDXX) -std=gnu++14 \ ++ $(BUILDXX) -std=gnu++17 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + $(shell $(LLVM_CONFIG) --libs) \ +@@ -347,12 +347,12 @@ + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-llvm-version.bin: +- $(BUILDXX) -std=gnu++14 \ ++ $(BUILDXX) -std=gnu++17 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + > $(@:.bin=.make.output) 2>&1 + + $(OUTPUT)test-clang.bin: +- $(BUILDXX) -std=gnu++14 \ ++ $(BUILDXX) -std=gnu++17 \ + -I$(shell $(LLVM_CONFIG) --includedir) \ + -L$(shell $(LLVM_CONFIG) --libdir) \ + -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \ + diff --git a/dev-util/perf/perf-6.0-r1.ebuild b/dev-util/perf/perf-6.0-r1.ebuild index be9dbc82a5f9..04184b462006 100644 --- a/dev-util/perf/perf-6.0-r1.ebuild +++ b/dev-util/perf/perf-6.0-r1.ebuild @@ -145,6 +145,7 @@ src_prepare() { pushd "${S_K}" >/dev/null || die eapply "${FILESDIR}"/${P}-clang.patch + eapply "${FILESDIR}"/perf-6.0-c++17.patch popd || die # Drop some upstream too-developer-oriented flags and fix the diff --git a/dev-util/perf/perf-6.2-r1.ebuild b/dev-util/perf/perf-6.2-r1.ebuild index 8dc6385d598e..8a46cf67337d 100644 --- a/dev-util/perf/perf-6.2-r1.ebuild +++ b/dev-util/perf/perf-6.2-r1.ebuild @@ -145,6 +145,7 @@ src_prepare() { pushd "${S_K}" >/dev/null || die eapply "${FILESDIR}"/perf-6.0-clang.patch + eapply "${FILESDIR}"/perf-6.0-c++17.patch popd || die # Drop some upstream too-developer-oriented flags and fix the