Use realpath for srctree and objtree
PATCH 1/1 Use realpath for srctree and objtree
When BUILD_SRC contains a tailing '/', the file name used in compiling command will contain '//', and it then goes to .o's debuginfo, confuses debugedit:
https://bugzilla.redhat.com/show_bug.cgi?id=304121
This patch uses realpath to makesure srctree and objtree don't have tailing '/'.
--- tools/lib/lockdep/Makefile | 4 ++-- tools/lib/traceevent/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/lockdep/Makefile +2 -2
@@ -87,8 +87,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)
tools/lib/traceevent/Makefile +2 -2
@@ -107,8 +107,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)
Signature · 1 line
1.8.4
Quoted 40 lines · Wang Nan
When
BUILD_SRCcontains a tailing '/', the file name used in compiling command will contain '//', and it then goes to .o's debuginfo, confuses debugedit:https://bugzilla.redhat.com/show_bug.cgi?id=304121
This patch uses realpath to makesure srctree and objtree don't have tailing '/'.
Signed-off-by Wang Nan <[email protected]>Cc Sasha Levin <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Jiri Olsa <[email protected]>Cc Steven Rostedt <[email protected]>Cc Namhyung Kim <[email protected]>Cc Geng Hui <[email protected]>--- tools/lib/lockdep/Makefile | 4 ++-- tools/lib/traceevent/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)tools/lib/lockdep/Makefile +2
-2@@ -87,8 +87,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)tools/lib/traceevent/Makefile +0
-0
tools/lib/traceevent/Makefile endif # BUILD_SRC · line 113
Quoted 9 lines
tools/lib/traceevent/Makefile +2
-2@@ -107,8 +107,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)
ack for the traceevent change
thanks,
jirka
Quoted 15 lines · Wang Nan
When
BUILD_SRCcontains a tailing '/', the file name used in compiling command will contain '//', and it then goes to .o's debuginfo, confuses debugedit:https://bugzilla.redhat.com/show_bug.cgi?id=304121
This patch uses realpath to makesure srctree and objtree don't have tailing '/'.
Signed-off-by Wang Nan <[email protected]>Cc Sasha Levin <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Jiri Olsa <[email protected]>Cc Steven Rostedt <[email protected]>Cc Namhyung Kim <[email protected]>Cc Geng Hui <[email protected]>
Quoted 1 line
---
For the liblockdep changes:
Thanks,
Sasha
PATCH RESEND 1/2 liblockdep: Use realpath for srctree and objtree
In reply to Wang NanIf BUILD_SRC or CURDIR contains tailing '/', the file names passed to gcc will contain '//'. It will be contained .o's in debuginfo, then confuse debugedit:
https://bugzilla.redhat.com/show_bug.cgi?id=304121
This patch uses realpath command to makesure potential tailing '/'s are removed.
--- tools/lib/lockdep/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/lockdep/Makefile +2 -2
@@ -87,8 +87,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)
Signature · 1 line
1.8.4
Re: [PATCH resend 1/2] liblockdep: Use realpath for srctree and objtree
Hi Wang,
Thanks! I've picked it up and will send it in the next pull request.
Thanks,
Sasha
Quoted 33 lines · Wang Nan
If
BUILD_SRCor CURDIR contains tailing '/', the file names passed to gcc will contain '//'. It will be contained .o's in debuginfo, then confuse debugedit:https://bugzilla.redhat.com/show_bug.cgi?id=304121
This patch uses realpath command to makesure potential tailing '/'s are removed.
Signed-off-by Wang Nan <[email protected]>Acked-by Sasha Levin <[email protected]>Cc Ingo Molnar <[email protected]>Cc Andrew Morton <[email protected]>Cc Geng Hui <[email protected]>--- tools/lib/lockdep/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/lib/lockdep/Makefile +2
-2@@ -87,8 +87,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)
PATCH RESEND 2/2 tools lib traceevent: Use realpath for srctree and objtree
In reply to Wang NanIf BUILD_SRC or CURDIR contains tailing '/', the file names passed to gcc will contain '//'. It will be contained .o's in debuginfo, then confuse debugedit:
https://bugzilla.redhat.com/show_bug.cgi?id=304121
This patch uses realpath command to makesure potential tailing '/'s are removed.
--- tools/lib/traceevent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/traceevent/Makefile +2 -2
@@ -107,8 +107,8 @@ endif # BUILD_SRC # We process the rest of the Makefile if this is the final invocation of make ifeq ($(skip-makefile),) -srctree := $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR)) -objtree := $(CURDIR) +srctree := $(realpath $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))) +objtree := $(realpath $(CURDIR)) src := $(srctree) obj := $(objtree)
Signature · 1 line
1.8.4