41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sat, 04 Mar 2017 01:44:15 +0000
|
|
Subject: Kbuild.include: addtree: Remove quotes before matching path
|
|
Bug-Debian: https://bugs.debian.org/856474
|
|
Forwarded: https://marc.info/?l=linux-kbuild&m=148987677205629
|
|
|
|
systemtap currently fails to build modules when the kernel source and
|
|
object trees are separate.
|
|
|
|
systemtap adds something like -I"/usr/share/systemtap/runtime" to
|
|
EXTRA_CFLAGS, and addtree should not adjust this as it's specifying an
|
|
absolute directory. But since make has no understanding of shell
|
|
quoting, it does anyway.
|
|
|
|
For a long time this didn't matter, because addtree would still emit
|
|
the original -I option after the adjusted one. However, commit
|
|
db547ef19064 ("Kbuild: don't add obj tree in additional includes")
|
|
changed it to remove the original -I option.
|
|
|
|
Remove quotes (both double and single) before matching against the
|
|
excluded patterns.
|
|
|
|
References: https://bugs.debian.org/856474
|
|
Reported-by: Jack Henschel <jackdev@mailbox.org>
|
|
Reported-by: Ritesh Raj Sarraf <rrs@debian.org>
|
|
Fixes: db547ef19064 ("Kbuild: don't add obj tree in additional includes")
|
|
Cc: stable@vger.kernel.org # 4.8+
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
--- a/scripts/Kbuild.include
|
|
+++ b/scripts/Kbuild.include
|
|
@@ -215,7 +215,7 @@ hdr-inst := -f $(srctree)/scripts/Makefi
|
|
# Prefix -I with $(srctree) if it is not an absolute path.
|
|
# skip if -I has no parameter
|
|
addtree = $(if $(patsubst -I%,%,$(1)), \
|
|
-$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
|
|
+$(if $(filter-out -I/% -I./% -I../%,$(subst $(quote),,$(subst $(squote),,$(1)))),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
|
|
|
|
# Find all -I options and call addtree
|
|
flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
|