[Minios-devel] [UNIKRAFT PATCH v2] build: support for sharing libraries across multiple platforms

[Florian Schmidt <florian.schmidt@xxxxxxxxx>]

Currently, if a library is added to the list of libraries-to-be-built
more than once, this will lead to problems when make rules are
installed, as well as in the linking step (trying to link multiple
versions in, resulting in duplicate symbols).
This patch aggregates all libraries first, then removes duplicates (via
make's $(sort) function), and so makes sure no library is built more
than once.

Why would this happen? The best example is having a platform library used
by two platforms, for example, using libpci for a kvm and a baremetal
platform, which requires two addplatlib calls, one for each platform it
is registered with.

The same applies to cleaning, respectively.

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
Signed-off-by: Florian Schmidt <florian.schmidt@xxxxxxxxx>
---
 support/build/Makefile.build | 21 +++++++++++----------
 support/build/Makefile.clean |  8 ++++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/support/build/Makefile.build b/support/build/Makefile.build
index 5679741d..6a0091c2 100644
--- a/support/build/Makefile.build
+++ b/support/build/Makefile.build
@@ -26,16 +26,12 @@
 ifneq ($(call qstrip,$(UK_LIBS) $(UK_LIBS-y)),)
 $(foreach L,$(UK_LIBS) $(UK_LIBS-y), \
 $(if $(call qstrip,$($(call uc,$(L))_SRCS) $($(call uc,$(L))_SRCS-y)), \
-$(foreach S,$($(call uc,$(L))_SRCS) $($(call uc,$(L))_SRCS-y), \
-$(eval $(call buildrule_libobj_multitarget,$(L),$(S))) \
-); \
-$(eval $(call buildrule_olib,$(L))); \
 $(eval UK_OLIBS-y += $(call libname2olib,$(L))); \
+$(eval UKBUILD_LIBS += $(L)); \
 ) \
 )
 endif
 
-
 #################################################
 #
 # Install build rules for each enabled platform
@@ -47,13 +43,18 @@ $(foreach P,$(UK_PLATS) $(UK_PLATS-y), \
 $(if $(call qstrip,$($(call uc,$(P))_LIBS) $($(call uc,$(P))_LIBS-y)), \
 $(foreach L,$($(call uc,$(P))_LIBS) $($(call uc,$(P))_LIBS-y), \
 $(if $(call qstrip,$($(call uc,$(L))_SRCS) $($(call uc,$(L))_SRCS-y)), \
+$(eval $(call uc,$(P))_OLIBS-y += $(call libname2olib,$(L))); \
+$(eval UKBUILD_LIBS += $(L)); \
+) \
+) \
+) \
+)
+
+endif
+
+$(foreach L,$(sort $(UKBUILD_LIBS)), \
 $(foreach S,$($(call uc,$(L))_SRCS) $($(call uc,$(L))_SRCS-y), \
 $(eval $(call buildrule_libobj_multitarget,$(L),$(S))) \
 ); \
 $(eval $(call buildrule_olib,$(L))); \
-$(eval $(call uc,$(P))_OLIBS-y    += $(call libname2olib,$(L))); \
-) \
-) \
-); \
 )
-endif
diff --git a/support/build/Makefile.clean b/support/build/Makefile.clean
index 0ad3d155..a131119e 100644
--- a/support/build/Makefile.clean
+++ b/support/build/Makefile.clean
@@ -25,7 +25,7 @@
 
 ifneq ($(call qstrip,$(UK_LIBS) $(UK_LIBS-y)),)
 $(foreach L,$(UK_LIBS) $(UK_LIBS-y), \
-$(eval $(call cleanrule_lib,$(L))); \
+$(eval UKCLEAN_LIBS += $(L)); \
 )
 endif
 
@@ -40,8 +40,12 @@ ifneq ($(call qstrip,$(UK_PLATS) $(UK_PLATS-y)),)
 $(foreach P,$(UK_PLATS) $(UK_PLATS-y), \
 $(if $(call qstrip,$($(call uc,$(P))_LIBS) $($(call uc,$(P))_LIBS-y)), \
 $(foreach L,$($(call uc,$(P))_LIBS) $($(call uc,$(P))_LIBS-y), \
-$(eval $(call cleanrule_lib,$(L))); \
+$(eval UKCLEAN_LIBS += $(L)); \
 ) \
 ) \
 )
 endif
+
+$(foreach L,$(sort $(UKCLEAN_LIBS)), \
+$(eval $(call cleanrule_lib,$(L))); \
+)
-- 
2.21.0


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel