From 4ba4126eb7d5279fb4fd91f3066ef021fa75748d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 24 Apr 2023 07:13:19 +0000 Subject: [PATCH] dev-util/perf: Sync with Gentoo It's from Gentoo commit d1a3661d06ab2036402024ea792bad26b7eb2cda. --- .../dev-util/perf/files/perf-6.0-c++17.patch | 39 +++++++++++++++++++ .../{perf-5.19.ebuild => perf-5.19-r1.ebuild} | 4 +- .../{perf-6.0.ebuild => perf-6.0-r1.ebuild} | 5 ++- .../{perf-6.2.ebuild => perf-6.2-r1.ebuild} | 5 ++- 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-6.0-c++17.patch rename sdk_container/src/third_party/portage-stable/dev-util/perf/{perf-5.19.ebuild => perf-5.19-r1.ebuild} (98%) rename sdk_container/src/third_party/portage-stable/dev-util/perf/{perf-6.0.ebuild => perf-6.0-r1.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/dev-util/perf/{perf-6.2.ebuild => perf-6.2-r1.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-6.0-c++17.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-6.0-c++17.patch new file mode 100644 index 0000000000..08c34bc552 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19-r1.ebuild index 129012be23..ea6fd7e11d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19-r1.ebuild @@ -37,8 +37,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# setuptools (and Python) are always needed even if not building Python bindings BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -48,7 +51,6 @@ BDEPEND=" app-text/xmlto sys-process/time ) - ${PYTHON_DEPS} " RDEPEND="audit? ( sys-process/audit ) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0-r1.ebuild index 611ca82244..04184b4620 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0-r1.ebuild @@ -36,8 +36,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# setuptools (and Python) are always needed even if not building Python bindings BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -47,7 +50,6 @@ BDEPEND=" app-text/xmlto sys-process/time ) - ${PYTHON_DEPS} " RDEPEND="audit? ( sys-process/audit ) @@ -143,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/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2-r1.ebuild index c9df3f9793..8a46cf6733 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.2-r1.ebuild @@ -36,8 +36,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# setuptools (and Python) are always needed even if not building Python bindings BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] sys-devel/bison sys-devel/flex virtual/pkgconfig @@ -47,7 +50,6 @@ BDEPEND=" app-text/xmlto sys-process/time ) - ${PYTHON_DEPS} " RDEPEND="audit? ( sys-process/audit ) @@ -143,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