qemu-s390x
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 12/14] contrib/plugins: be more vocal building


From: Alex Bennée
Subject: [PATCH 12/14] contrib/plugins: be more vocal building
Date: Mon, 29 Jul 2024 15:44:12 +0100

With the conversion to meson and removing the old QEMU Makefile
baggage we became very silent when building the plugins. Bring in a
copy of the quiet-command logic (and some magic COMMAs) so we can at
least assure developers we are building them.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2457
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
Maybe we should just move to a meson build as proposed here:

https://gitlab.com/qemu-project/qemu/-/issues/1710
---
 contrib/plugins/Makefile | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
index 98a89d5c40..edf256cd9d 100644
--- a/contrib/plugins/Makefile
+++ b/contrib/plugins/Makefile
@@ -39,26 +39,41 @@ endif
 
 SONAMES := $(addsuffix $(SO_SUFFIX),$(addprefix lib,$(NAMES)))
 
-# The main QEMU uses Glib extensively so it's perfectly fine to use it
+# The main QEMU uses Glib extensively so it is perfectly fine to use it
 # in plugins (which many example do).
 PLUGIN_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0)
 PLUGIN_CFLAGS += -fPIC -Wall
 PLUGIN_CFLAGS += -I$(TOP_SRC_PATH)/include/qemu
 
+# Helper that honours V=1 so we get some output when compiling
+quiet-@ = $(if $(V),,@$(if $1,printf "  %-7s %s\n" "$(strip $1)" "$(strip $2)" 
&& ))
+quiet-command = $(call quiet-@,$2,$3)$1
+
+# for including , in command strings
+COMMA := ,
+
 all: $(SONAMES)
 
 %.o: %.c
-       $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $<
+       $(call quiet-command, \
+               $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $<, \
+               BUILD, plugin $@)
 
 ifeq ($(CONFIG_WIN32),y)
 lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/libqemu_plugin_api.a
-       $(CC) -shared -o $@ $^ $(LDLIBS)
+       $(call quiet-command, \
+               $(CC) -shared -o $@ $^ $(LDLIBS), \
+               LINK, plugin $@)
 else ifeq ($(CONFIG_DARWIN),y)
 lib%$(SO_SUFFIX): %.o
-       $(CC) -bundle -Wl,-undefined,dynamic_lookup -o $@ $^ $(LDLIBS)
+       $(call quiet-command, \
+               $(CC) -bundle -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup -o $@ 
$^ $(LDLIBS), \
+               LINK, plugin $@)
 else
 lib%$(SO_SUFFIX): %.o
-       $(CC) -shared -o $@ $^ $(LDLIBS)
+       $(call quiet-command, \
+               $(CC) -shared -o $@ $^ $(LDLIBS), \
+               LINK, plugin $@)
 endif
 
 
-- 
2.39.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]