[PATCH v2 0/5] kbuild: Clean-up and bug fixes of scripts/Makefile.host

[PATCH v2 0/5] kbuild: Clean-up and bug fixes of scripts/Makefile.host

[Masahiro Yamada]

Masahiro Yamada (5):
  kbuild: fix a typo in scripts/Makefile.host
  kbuild: fix a bug of C++ host program handling
  kbuild: drop shared library support from Makefile.host
  kbuild: clean up scripts/Makefile.host
  kbuild: clean-up and bug fix of scripts/Makefile.host

 scripts/Makefile.host | 62 +++++++++------------------------------------------
 1 file changed, 10 insertions(+), 52 deletions(-)

-- 
1.9.1

[PATCH v2 1/5] kbuild: fix a typo in scripts/Makefile.host

[Masahiro Yamada]

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v2: None

 scripts/Makefile.host | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 6689364..395a240 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -44,7 +44,7 @@ host-cmulti	:= $(foreach m,$(__hostprogs),\
 host-cobjs	:= $(sort $(foreach m,$(__hostprogs),$($(m)-objs)))
 
 # C++ code
-# C++ executables compiled from at least on .cc file
+# C++ executables compiled from at least one .cc file
 # and zero or more .c files
 host-cxxmulti	:= $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
 
-- 
1.9.1

[PATCH v2 2/5] kbuild: fix a bug of C++ host program handling

[Masahiro Yamada]

The comment claims:
  C++ executables compiled from at least one .cc file
  and zero or more .c files

But C++ executables with zero .c file fail in build.

For example, assume we have a Makefile like this:

  hostprogs-y := foo
  foo-cxxobjs := bar.o

In this case, foo is treated as host-csingle
and Kbuild tries to search non-existing foo.c source.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v2: None

 scripts/Makefile.host | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 395a240..bf44e79 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -34,7 +34,8 @@ __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
 
 # C code
 # Executables compiled from a single .c file
-host-csingle	:= $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))
+host-csingle	:= $(foreach m,$(__hostprogs), \
+			$(if $($(m)-objs)$($(m)-cxxobjs),,$(m)))
 
 # C executables linked based on several .o files
 host-cmulti	:= $(foreach m,$(__hostprogs),\
-- 
1.9.1

[PATCH v2 3/5] kbuild: drop shared library support from Makefile.host

[Masahiro Yamada]

The shared library feature in Makefile.host is no longer used.
Rip it off to keep the build infrastucture simple.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Suggested-by: Sam Ravnborg <sam@ravnborg.org>
---

Changes in v2:
  - Newly added

 scripts/Makefile.host | 43 +++----------------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index bf44e79..1c2e570 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -20,16 +20,6 @@
 # Will compile qconf as a C++ program, and menu as a C program.
 # They are linked as C++ code to the executable qconf
 
-# hostprogs-y := conf
-# conf-objs  := conf.o libkconfig.so
-# libkconfig-objs := expr.o type.o
-# Will create a shared library named libkconfig.so that consists of
-# expr.o and type.o (they are both compiled as C code and the object files
-# are made as position independent code).
-# conf.c is compiled as a C program, and conf.o is linked together with
-# libkconfig.so as the executable conf.
-# Note: Shared libraries consisting of C++ files are not supported
-
 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
 
 # C code
@@ -52,15 +42,6 @@ host-cxxmulti	:= $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
 # C++ Object (.o) files compiled from .cc files
 host-cxxobjs	:= $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
 
-# Shared libaries (only .c supported)
-# Shared libraries (.so) - all .so files referenced in "xxx-objs"
-host-cshlib	:= $(sort $(filter %.so, $(host-cobjs)))
-# Remove .so files from "xxx-objs"
-host-cobjs	:= $(filter-out %.so,$(host-cobjs))
-
-#Object (.o) files used by the shared libaries
-host-cshobjs	:= $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
-
 # output directory for programs/.o files
 # hostprogs-y := tools/build may have been specified. Retrieve directory
 host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
@@ -82,8 +63,6 @@ host-cmulti	:= $(addprefix $(obj)/,$(host-cmulti))
 host-cobjs	:= $(addprefix $(obj)/,$(host-cobjs))
 host-cxxmulti	:= $(addprefix $(obj)/,$(host-cxxmulti))
 host-cxxobjs	:= $(addprefix $(obj)/,$(host-cxxobjs))
-host-cshlib	:= $(addprefix $(obj)/,$(host-cshlib))
-host-cshobjs	:= $(addprefix $(obj)/,$(host-cshobjs))
 host-objdirs    := $(addprefix $(obj)/,$(host-objdirs))
 
 obj-dirs += $(host-objdirs)
@@ -124,7 +103,7 @@ quiet_cmd_host-cmulti	= HOSTLD  $@
       cmd_host-cmulti	= $(HOSTCC) $(HOSTLDFLAGS) -o $@ \
 			  $(addprefix $(obj)/,$($(@F)-objs)) \
 			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
-$(host-cmulti): $(obj)/%: $(host-cobjs) $(host-cshlib) FORCE
+$(host-cmulti): $(obj)/%: $(host-cobjs) FORCE
 	$(call if_changed,host-cmulti)
 
 # Create .o file from a single .c file
@@ -141,7 +120,7 @@ quiet_cmd_host-cxxmulti	= HOSTLD  $@
 			  $(foreach o,objs cxxobjs,\
 			  $(addprefix $(obj)/,$($(@F)-$(o)))) \
 			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
-$(host-cxxmulti): $(obj)/%: $(host-cobjs) $(host-cxxobjs) $(host-cshlib) FORCE
+$(host-cxxmulti): $(obj)/%: $(host-cobjs) $(host-cxxobjs) FORCE
 	$(call if_changed,host-cxxmulti)
 
 # Create .o file from a single .cc (C++) file
@@ -150,21 +129,5 @@ quiet_cmd_host-cxxobjs	= HOSTCXX $@
 $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
 	$(call if_changed_dep,host-cxxobjs)
 
-# Compile .c file, create position independent .o file
-# host-cshobjs -> .o
-quiet_cmd_host-cshobjs	= HOSTCC  -fPIC $@
-      cmd_host-cshobjs	= $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
-$(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
-	$(call if_changed_dep,host-cshobjs)
-
-# Link a shared library, based on position independent .o files
-# *.o -> .so shared library (host-cshlib)
-quiet_cmd_host-cshlib	= HOSTLLD -shared $@
-      cmd_host-cshlib	= $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
-			  $(addprefix $(obj)/,$($(@F:.so=-objs))) \
-			  $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
-$(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
-	$(call if_changed,host-cshlib)
-
 targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
-	   $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
+	   $(host-cxxmulti) $(host-cxxobjs)
-- 
1.9.1

Re: [PATCH v2 3/5] kbuild: drop shared library support from Makefile.host

[Michal Marek]

On 2014-06-09 06:16, Masahiro Yamada wrote:
> The shared library feature in Makefile.host is no longer used.
> Rip it off to keep the build infrastucture simple.
> 
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Suggested-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> 
> Changes in v2:
>   - Newly added
> 
>  scripts/Makefile.host | 43 +++----------------------------------------
>  1 file changed, 3 insertions(+), 40 deletions(-)

Hi Masahiro-san,

sorry for the late review. This change looks good, given that the usage
of shared libraries has been dropped almost ten years ago :). Just
please also remove section 4.3 of Documentation/kbuild/makefiles.txt.

Michal

Re: [PATCH v2 3/5] kbuild: drop shared library support from Makefile.host

[Masahiro Yamada]

Hi Michal,



On Fri, 11 Jul 2014 15:35:39 +0200
Michal Marek <mmarek@suse.cz> wrote:

> On 2014-06-09 06:16, Masahiro Yamada wrote:
> > The shared library feature in Makefile.host is no longer used.
> > Rip it off to keep the build infrastucture simple.
> > 
> > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > Suggested-by: Sam Ravnborg <sam@ravnborg.org>
> > ---
> > 
> > Changes in v2:
> >   - Newly added
> > 
> >  scripts/Makefile.host | 43 +++----------------------------------------
> >  1 file changed, 3 insertions(+), 40 deletions(-)
> 
> Hi Masahiro-san,
> 
> sorry for the late review. This change looks good, given that the usage
> of shared libraries has been dropped almost ten years ago :). Just
> please also remove section 4.3 of Documentation/kbuild/makefiles.txt.
> 


Updated makefiles.txt in v3.

Thanks!



Best Regards
Masahiro Yamada

[PATCH v2 4/5] kbuild: clean up scripts/Makefile.host

[Masahiro Yamada]

The directory creation can be more simplified by two levels.

[1] Drop $(dir ...)

 $(dir $(f)) always returns non-empty string.

So, $(if $(dir $(f)),$(dir $(f)) is equivalent to $(dir $(f)).

[2] Unroll $(foreach ...) loop

$(dir ...) can have one or more paths and returns a list of
directories of them.

$(foreach f, $(progs), $(dir $(f))) can be unrolled as

$(dir $(progs))

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v2:
  - Further more clean-up by enrolling $(foreach ) loop

 scripts/Makefile.host | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 1c2e570..bb6a11f 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -44,15 +44,11 @@ host-cxxobjs	:= $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
 
 # output directory for programs/.o files
 # hostprogs-y := tools/build may have been specified. Retrieve directory
-host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
+host-objdirs := $(dir $(__hostprogs))
 # directory of .o files from prog-objs notation
-host-objdirs += $(foreach f,$(host-cmulti),                  \
-                    $(foreach m,$($(f)-objs),                \
-                        $(if $(dir $(m)),$(dir $(m)))))
+host-objdirs += $(dir $(foreach f,$(host-cmulti), $($(f)-objs)))
 # directory of .o files from prog-cxxobjs notation
-host-objdirs += $(foreach f,$(host-cxxmulti),                  \
-                    $(foreach m,$($(f)-cxxobjs),                \
-                        $(if $(dir $(m)),$(dir $(m)))))
+host-objdirs += $(dir $(foreach f,$(host-cxxmulti), $($(f)-cxxobjs)))
 
 host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
 
-- 
1.9.1

[PATCH v2 5/5] kbuild: clean-up and bug fix of scripts/Makefile.host

[Masahiro Yamada]

Assume we have a Makefile like this:

  hostprogs-y := foo
  foo-cxxobjs := bar/baz.o
  foo-objs := qux/quux.o

In this case, Kbuild creates bar/ directory,
but fails to create qux/ directory.

This commit re-writes directory creation more simply,
fixing that bug.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v2:
  - More simplify host-objdirs

 scripts/Makefile.host | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index bb6a11f..064d825 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -43,12 +43,10 @@ host-cxxmulti	:= $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
 host-cxxobjs	:= $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
 
 # output directory for programs/.o files
-# hostprogs-y := tools/build may have been specified. Retrieve directory
-host-objdirs := $(dir $(__hostprogs))
-# directory of .o files from prog-objs notation
-host-objdirs += $(dir $(foreach f,$(host-cmulti), $($(f)-objs)))
-# directory of .o files from prog-cxxobjs notation
-host-objdirs += $(dir $(foreach f,$(host-cxxmulti), $($(f)-cxxobjs)))
+# hostprogs-y := tools/build may have been specified.
+# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
+host-objdirs := $(dir \
+	     $(foreach f, $(__hostprogs), $(f) $($(f)-objs) $($(f)-cxxobjs)))
 
 host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
 
-- 
1.9.1

Re: [PATCH v2 5/5] kbuild: clean-up and bug fix of scripts/Makefile.host

[Michal Marek]

On 2014-06-09 06:16, Masahiro Yamada wrote:
> -# hostprogs-y := tools/build may have been specified. Retrieve directory
> -host-objdirs := $(dir $(__hostprogs))
> -# directory of .o files from prog-objs notation
> -host-objdirs += $(dir $(foreach f,$(host-cmulti), $($(f)-objs)))
> -# directory of .o files from prog-cxxobjs notation
> -host-objdirs += $(dir $(foreach f,$(host-cxxmulti), $($(f)-cxxobjs)))
> +# hostprogs-y := tools/build may have been specified.
> +# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
> +host-objdirs := $(dir \
> +	     $(foreach f, $(__hostprogs), $(f) $($(f)-objs) $($(f)-cxxobjs)))

You could also use the $(host-cobjs) and $(host-cxxobjs) variables
defined earlier and write

host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))

Michal

Re: [PATCH v2 5/5] kbuild: clean-up and bug fix of scripts/Makefile.host

[Masahiro Yamada]

Hi Michal,



On Fri, 11 Jul 2014 15:46:44 +0200
Michal Marek <mmarek@suse.cz> wrote:

> On 2014-06-09 06:16, Masahiro Yamada wrote:
> > -# hostprogs-y := tools/build may have been specified. Retrieve directory
> > -host-objdirs := $(dir $(__hostprogs))
> > -# directory of .o files from prog-objs notation
> > -host-objdirs += $(dir $(foreach f,$(host-cmulti), $($(f)-objs)))
> > -# directory of .o files from prog-cxxobjs notation
> > -host-objdirs += $(dir $(foreach f,$(host-cxxmulti), $($(f)-cxxobjs)))
> > +# hostprogs-y := tools/build may have been specified.
> > +# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
> > +host-objdirs := $(dir \
> > +	     $(foreach f, $(__hostprogs), $(f) $($(f)-objs) $($(f)-cxxobjs)))
> 
> You could also use the $(host-cobjs) and $(host-cxxobjs) variables
> defined earlier and write
> 
> host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs))
> 


Yup, this is much cleaner.
Fixed in v3.

Thanks!


Best Regards
Masahiro Yamada

Re: [PATCH v2 0/5] kbuild: Clean-up and bug fixes of scripts/Makefile.host

[Michal Marek]

On 2014-06-09 06:16, Masahiro Yamada wrote:
> Masahiro Yamada (5):
>   kbuild: fix a typo in scripts/Makefile.host
>   kbuild: fix a bug of C++ host program handling
>   kbuild: drop shared library support from Makefile.host
>   kbuild: clean up scripts/Makefile.host
>   kbuild: clean-up and bug fix of scripts/Makefile.host


Thanks for the cleanup, but I'll postpone it for the next merge window.
Thanks for your understanding.

Michal

Re: [PATCH v2 0/5] kbuild: Clean-up and bug fixes of scripts/Makefile.host

[Masahiro Yamada]

Hi Michal,



On Tue, 10 Jun 2014 15:21:06 +0200
Michal Marek <mmarek@suse.cz> wrote:

> On 2014-06-09 06:16, Masahiro Yamada wrote:
> > Masahiro Yamada (5):
> >   kbuild: fix a typo in scripts/Makefile.host
> >   kbuild: fix a bug of C++ host program handling
> >   kbuild: drop shared library support from Makefile.host
> >   kbuild: clean up scripts/Makefile.host
> >   kbuild: clean-up and bug fix of scripts/Makefile.host
> 
> 
> Thanks for the cleanup, but I'll postpone it for the next merge window.
> Thanks for your understanding.
> 
> Michal


This is just for reminder. (Sorry if I am bothering you..)

If you are planing to apply this series for the next merge window,
isn't it better to apply it onto kbuild.git#kbuild earlier
so it is widely tested in linux-next?


Best Regards
Masahiro Yamada