From b44158de9e318fbc92ac6c665ad3d0c948e80ac3 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 1 May 2008 19:29:47 +0200 Subject: [PATCH 1/2] kconfig: made check-lxdialog more portable OS-X shell did not like 'echo -e' so implement suggestion from Al Viro to use a more portable construct. Signed-off-by: Sam Ravnborg Cc: Al Viro Acked-By: Timur Tabi --- scripts/kconfig/lxdialog/check-lxdialog.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index 62e1e02126e6..5552154cbedb 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh @@ -36,8 +36,10 @@ trap "rm -f $tmp" 0 1 2 3 15 # Check if we can link to ncurses check() { - echo -e " #include CURSES_LOC \n main() {}" | - $cc -xc - -o $tmp 2> /dev/null + $cc -xc - -o $tmp 2>/dev/null <<'EOF' +#include CURSES_LOC +main() {} +EOF if [ $? != 0 ]; then echo " *** Unable to find the ncurses libraries or the" 1>&2 echo " *** required header files." 1>&2 From 90ebd878a5900839106664fae40a6cc83dbe86ab Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Thu, 1 May 2008 19:31:35 +0200 Subject: [PATCH 2/2] kbuild: fix vmlinux.o link We always linked vmliux.o. Remove init/built-in.o dependency so we avoid this Signed-off-by: Sam Ravnborg --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d3634cd6fe35..5cf825819533 100644 --- a/Makefile +++ b/Makefile @@ -794,7 +794,7 @@ endif # ifdef CONFIG_KALLSYMS quiet_cmd_vmlinux-modpost = LD $@ cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@ \ $(vmlinux-init) --start-group $(vmlinux-main) --end-group \ - $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^) + $(filter-out $(vmlinux-init) $(vmlinux-main) FORCE ,$^) define rule_vmlinux-modpost : +$(call cmd,vmlinux-modpost) @@ -818,7 +818,9 @@ endif ifdef CONFIG_KALLSYMS .tmp_vmlinux1: vmlinux.o endif -vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE + +modpost-init := $(filter-out init/built-in.o, $(vmlinux-init)) +vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE $(call if_changed_rule,vmlinux-modpost) # The actual objects are generated when descending,