From: Greg Kroah-Hartman Date: Mon, 11 Apr 2022 12:55:23 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.9.310~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7596ff1b3d64ce0612c8e2fa05699561bc36ed98;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index 539007523b2..21cf027a8db 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -254,3 +254,4 @@ btrfs-fix-qgroup-reserve-overflow-the-qgroup-limit.patch arm64-patch_text-fixup-last-cpu-should-be-master.patch perf-qcom_l2_pmu-fix-an-incorrect-null-check-on-list-iterator.patch irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch +tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch diff --git a/queue-4.14/tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch b/queue-4.14/tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch new file mode 100644 index 00000000000..fdf37c82349 --- /dev/null +++ b/queue-4.14/tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch @@ -0,0 +1,48 @@ +From 541f695cbcb6932c22638b06e0cbe1d56177e2e9 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Mon, 4 Apr 2022 17:28:48 -0300 +Subject: tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts + +From: Arnaldo Carvalho de Melo + +commit 541f695cbcb6932c22638b06e0cbe1d56177e2e9 upstream. + +Just like its done for ldopts and for both in tools/perf/Makefile.config. + +Using `` to initialize PERL_EMBED_CCOPTS somehow precludes using: + + $(filter-out SOMETHING_TO_FILTER,$(PERL_EMBED_CCOPTS)) + +And we need to do it to allow for building with versions of clang where +some gcc options selected by distros are not available. + +Tested-by: Sedat Dilek # Debian/Selfmade LLVM-14 (x86-64) +Cc: Adrian Hunter +Cc: Fangrui Song +Cc: Florian Fainelli +Cc: Ian Rogers +Cc: Jiri Olsa +Cc: John Keeping +Cc: Leo Yan +Cc: Michael Petlan +Cc: Namhyung Kim +Cc: Nathan Chancellor +Cc: Nick Desaulniers +Link: http://lore.kernel.org/lkml/YktYX2OnLtyobRYD@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman +--- + tools/build/feature/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/build/feature/Makefile ++++ b/tools/build/feature/Makefile +@@ -184,7 +184,7 @@ strip-libs = $(filter-out -l%,$(1)) + PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null) + PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS)) + PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS)) +-PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null` ++PERL_EMBED_CCOPTS = $(shell perl -MExtUtils::Embed -e ccopts 2>/dev/null) + FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS) + + $(OUTPUT)test-libperl.bin: