* [PATCH] let kbuild build foo/bar.o correctly
@ 2012-12-04 1:30 张忠山
2012-12-08 2:09 ` 张忠山
2012-12-08 11:19 ` Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: 张忠山 @ 2012-12-04 1:30 UTC (permalink / raw)
To: barebox
When obj-y has foo/bar.o, kbuild can't generate
foo/bar.o according foo/bar.c. Fix this
this patch based on linux kernel
commit 521cb40b0c44418a4fd36dc633f575813d59a43d
Signed-off-by: 张忠山 <zzs213@126.com>
---
scripts/Makefile.lib | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index cb46db2..14e471d 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -55,10 +55,10 @@ multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)))
multi-objs := $(multi-objs-y) $(multi-objs-m)
-# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live
-# in the local directory
-__subdir-obj-y := $(foreach o,$(pbl-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
-subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
+# $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to
+# tell kbuild to descend
+__subdir-obj-y := $(filter %/built-in-pbl.o, $(pbl-y))
+subdir-obj-y := $(filter %/built-in.o, $(obj-y))
subdir-obj-y += $(__subdir-obj-y)
# $(obj-dirs) is a list of directories that contain object files
--
1.7.4.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] let kbuild build foo/bar.o correctly
2012-12-04 1:30 [PATCH] let kbuild build foo/bar.o correctly 张忠山
@ 2012-12-08 2:09 ` 张忠山
2012-12-08 11:19 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: 张忠山 @ 2012-12-08 2:09 UTC (permalink / raw)
To: barebox
How about this patch.
Why nobody say anything?
--
Best Regards,
zzs
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] let kbuild build foo/bar.o correctly
2012-12-04 1:30 [PATCH] let kbuild build foo/bar.o correctly 张忠山
2012-12-08 2:09 ` 张忠山
@ 2012-12-08 11:19 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2012-12-08 11:19 UTC (permalink / raw)
To: 张忠山; +Cc: barebox
On Tue, Dec 04, 2012 at 09:30:47AM +0800, 张忠山 wrote:
> When obj-y has foo/bar.o, kbuild can't generate
> foo/bar.o according foo/bar.c. Fix this
>
> this patch based on linux kernel
> commit 521cb40b0c44418a4fd36dc633f575813d59a43d
>
> Signed-off-by: 张忠山 <zzs213@126.com>
Applied, thanks.
Sascha
> ---
> scripts/Makefile.lib | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index cb46db2..14e471d 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -55,10 +55,10 @@ multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
> multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)))
> multi-objs := $(multi-objs-y) $(multi-objs-m)
>
> -# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live
> -# in the local directory
> -__subdir-obj-y := $(foreach o,$(pbl-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
> -subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
> +# $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to
> +# tell kbuild to descend
> +__subdir-obj-y := $(filter %/built-in-pbl.o, $(pbl-y))
> +subdir-obj-y := $(filter %/built-in.o, $(obj-y))
> subdir-obj-y += $(__subdir-obj-y)
>
> # $(obj-dirs) is a list of directories that contain object files
> --
> 1.7.4.4
>
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-12-08 11:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-04 1:30 [PATCH] let kbuild build foo/bar.o correctly 张忠山
2012-12-08 2:09 ` 张忠山
2012-12-08 11:19 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox