dev-util/perf: Sync with Gentoo

It's from Gentoo commit d1a3661d06ab2036402024ea792bad26b7eb2cda.
This commit is contained in:
Flatcar Buildbot 2023-04-24 07:13:19 +00:00 committed by Krzesimir Nowak
parent 9b065d1378
commit 4ba4126eb7
4 changed files with 50 additions and 3 deletions

View File

@ -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) \

View File

@ -37,8 +37,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt
REQUIRED_USE="${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND=" BDEPEND="
${LINUX_PATCH+dev-util/patchutils} ${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison sys-devel/bison
sys-devel/flex sys-devel/flex
virtual/pkgconfig virtual/pkgconfig
@ -48,7 +51,6 @@ BDEPEND="
app-text/xmlto app-text/xmlto
sys-process/time sys-process/time
) )
${PYTHON_DEPS}
" "
RDEPEND="audit? ( sys-process/audit ) RDEPEND="audit? ( sys-process/audit )

View File

@ -36,8 +36,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt
REQUIRED_USE="${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND=" BDEPEND="
${LINUX_PATCH+dev-util/patchutils} ${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison sys-devel/bison
sys-devel/flex sys-devel/flex
virtual/pkgconfig virtual/pkgconfig
@ -47,7 +50,6 @@ BDEPEND="
app-text/xmlto app-text/xmlto
sys-process/time sys-process/time
) )
${PYTHON_DEPS}
" "
RDEPEND="audit? ( sys-process/audit ) RDEPEND="audit? ( sys-process/audit )
@ -143,6 +145,7 @@ src_prepare() {
pushd "${S_K}" >/dev/null || die pushd "${S_K}" >/dev/null || die
eapply "${FILESDIR}"/${P}-clang.patch eapply "${FILESDIR}"/${P}-clang.patch
eapply "${FILESDIR}"/perf-6.0-c++17.patch
popd || die popd || die
# Drop some upstream too-developer-oriented flags and fix the # Drop some upstream too-developer-oriented flags and fix the

View File

@ -36,8 +36,11 @@ IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl pyt
REQUIRED_USE="${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# setuptools (and Python) are always needed even if not building Python bindings
BDEPEND=" BDEPEND="
${LINUX_PATCH+dev-util/patchutils} ${LINUX_PATCH+dev-util/patchutils}
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
sys-devel/bison sys-devel/bison
sys-devel/flex sys-devel/flex
virtual/pkgconfig virtual/pkgconfig
@ -47,7 +50,6 @@ BDEPEND="
app-text/xmlto app-text/xmlto
sys-process/time sys-process/time
) )
${PYTHON_DEPS}
" "
RDEPEND="audit? ( sys-process/audit ) RDEPEND="audit? ( sys-process/audit )
@ -143,6 +145,7 @@ src_prepare() {
pushd "${S_K}" >/dev/null || die pushd "${S_K}" >/dev/null || die
eapply "${FILESDIR}"/perf-6.0-clang.patch eapply "${FILESDIR}"/perf-6.0-clang.patch
eapply "${FILESDIR}"/perf-6.0-c++17.patch
popd || die popd || die
# Drop some upstream too-developer-oriented flags and fix the # Drop some upstream too-developer-oriented flags and fix the