| Message ID | 20200313183652.10258-2-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | user-mode: Prune build dependencies (part 1) | expand |
Le 13/03/2020 à 19:36, Philippe Mathieu-Daudé a écrit : > Do not build the virtiofsd helper when configured with > --disable-system. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 7df22fcc5d..ed77b6e50b 100644 > --- a/Makefile > +++ b/Makefile > @@ -346,8 +346,8 @@ vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json > endif > > ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) > -HELPERS-y += virtiofsd$(EXESUF) > -vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json > +HELPERS-$(CONFIG_SOFTMMU) += virtiofsd$(EXESUF) > +vhost-user-json-$(CONFIG_SOFTMMU) += tools/virtiofsd/50-qemu-virtiofsd.json > endif > > # Sphinx does not allow building manuals into the same directory as > Why don't you do that instead? ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_SOFTMMU),yyyy) Thanks, Laurent
On 3/13/20 3:28 PM, Laurent Vivier wrote: >> ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) >> -HELPERS-y += virtiofsd$(EXESUF) >> -vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json >> +HELPERS-$(CONFIG_SOFTMMU) += virtiofsd$(EXESUF) >> +vhost-user-json-$(CONFIG_SOFTMMU) += tools/virtiofsd/50-qemu-virtiofsd.json ... > > Why don't you do that instead? > > ifeq > ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_SOFTMMU),yyyy) Seconded. r~
On 3/15/20 8:40 PM, Richard Henderson wrote: > On 3/13/20 3:28 PM, Laurent Vivier wrote: >>> ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) >>> -HELPERS-y += virtiofsd$(EXESUF) >>> -vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json >>> +HELPERS-$(CONFIG_SOFTMMU) += virtiofsd$(EXESUF) >>> +vhost-user-json-$(CONFIG_SOFTMMU) += tools/virtiofsd/50-qemu-virtiofsd.json > ... >> >> Why don't you do that instead? >> >> ifeq >> ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_SOFTMMU),yyyy) This was my first option but checkpatch complained because it is 80 chars long... I also tried: ifeq \ ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_SOFTMMU),yyyy) which is uglier and still too long. Following qemu-bridge-helper syntax I also tried: ifeq ($(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yy) HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += virtiofsd$(EXESUF) which is also too long ¯\_(ツ)_/¯ If you accept checkpatch complain I can use the form you prefer :) > > Seconded. > > r~ >
On 3/15/20 3:16 PM, Philippe Mathieu-Daudé wrote: > On 3/15/20 8:40 PM, Richard Henderson wrote: >> On 3/13/20 3:28 PM, Laurent Vivier wrote: >>>> ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) >>>> -HELPERS-y += virtiofsd$(EXESUF) >>>> -vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json >>>> +HELPERS-$(CONFIG_SOFTMMU) += virtiofsd$(EXESUF) >>>> +vhost-user-json-$(CONFIG_SOFTMMU) += tools/virtiofsd/50-qemu-virtiofsd.json >> ... >>> >>> Why don't you do that instead? >>> >>> ifeq >>> ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_SOFTMMU),yyyy) > > This was my first option but checkpatch complained because it is 80 chars long... > > I also tried: > > ifeq \ > ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_SOFTMMU),yyyy) > > which is uglier and still too long. > > Following qemu-bridge-helper syntax I also tried: > > ifeq ($(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yy) > HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += virtiofsd$(EXESUF) > > which is also too long ¯\_(ツ)_/¯ > > If you accept checkpatch complain I can use the form you prefer :) Hmph. Of the choices, I prefer the 80+ char line. r~
diff --git a/Makefile b/Makefile index 7df22fcc5d..ed77b6e50b 100644 --- a/Makefile +++ b/Makefile @@ -346,8 +346,8 @@ vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) -HELPERS-y += virtiofsd$(EXESUF) -vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json +HELPERS-$(CONFIG_SOFTMMU) += virtiofsd$(EXESUF) +vhost-user-json-$(CONFIG_SOFTMMU) += tools/virtiofsd/50-qemu-virtiofsd.json endif # Sphinx does not allow building manuals into the same directory as
Do not build the virtiofsd helper when configured with --disable-system. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)