Changeset 100578 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 14, 2023 2:02:17 PM (19 months ago)

Author:

vboxsync

Message:

Additions/VBoxClient: More trickery needed in order to get this working on Solaris, as the required libs don't have any suffixes there. For that we now use a macro which can generate different .def files for different Oses on-the-fly. See comments for details. Only tested on Linux so far [SCM fix]. bugref:10427

File:

• trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -206 +206 @@
  # @param 3  The library version, to be appended to the library .so name (e.g. "6.42" -> "libFoo.so.6.42").
  define def_libToLazyLoad
-        VBoxClient_SOURCES += \
-                $$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm
-        VBoxClient_CLEAN   += \
-                $$(VBoxClient_0_OUTDIR)/$(2).def \
-                $$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm
-        $$$$(VBoxClient_0_OUTDIR)/$(2).def: \
-                $$(PATH_ROOT)/src/VBox/GuestHost/$(2).def $(MAKEFILE_CURRENT) | $$$$(dir $$@)
-                $$(call MSG_GENERATE,$(2).def,$$@,$$<)
-                $$(eval LIB_TO_LAZYLOAD_SUFF=$$$$(if $(3),$(SUFF_DLL).$(3),$(SUFF_DLL)))
-                $$(QUIET)$$(RM) -f $$@
-                $$(QUIET)$$(REDIRECT) -o $$@ -- $$(SED) -e "s+@VBOX_LAZYLOAD_DEF_LIB_STRING@+$(2)$$(LIB_TO_LAZYLOAD_SUFF)+g" $$(PATH_ROOT)/src/VBox/GuestHost/$(2).def
-        $$$$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm: $$$$(VBoxClient_0_OUTDIR)/$(2).def $$(VBOX_DEF_2_LAZY_LOAD) | $$$$(dir $$@)
-                $$(call MSG_TOOL,VBoxDef2LazyLoad,VBoxClient,$$(VBoxClient_0_OUTDIR)/$(2).def -> $$@)
-                $$(QUIET)$$(RM) -f -- "$$@"
-                $$(QUIET)$$(VBOX_DEF_2_LAZY_LOAD) --system --library $(2)$(SUFF_DLL).$(3) --output "$$@" $$(VBoxClient_0_OUTDIR)/$(2).def
+  VBoxClient_SOURCES       += \
+        $$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm
+  VBoxClient_CLEAN         += \
+        $$(VBoxClient_0_OUTDIR)/$(2).def \
+        $$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm
+  $$$$(VBoxClient_0_OUTDIR)/$(2).def: \
+                $$(PATH_ROOT)/src/VBox/GuestHost/$(2).def $(MAKEFILE_CURRENT) | $$$$(dir $$@)
+        $$(call MSG_GENERATE,$(2).def,$$@,$$<)
+        $$(eval LIB_TO_LAZYLOAD_SUFF=$$$$(if $(3),$(SUFF_DLL).$(3),$(SUFF_DLL)))
+        $$(QUIET)$$(RM) -f $$@
+        $$(QUIET)$$(REDIRECT) -o $$@ -- $$(SED) -e "s+@VBOX_LAZYLOAD_DEF_LIB_STRING@+$(2)$$(LIB_TO_LAZYLOAD_SUFF)+g" $$(PATH_ROOT)/src/VBox/GuestHost/$(2).def
+  $$$$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm: $$$$(VBoxClient_0_OUTDIR)/$(2).def $$(VBOX_DEF_2_LAZY_LOAD) | $$$$(dir $$@)
+        $$(call MSG_TOOL,VBoxDef2LazyLoad,VBoxClient,$$(VBoxClient_0_OUTDIR)/$(2).def -> $$@)
+        $$(QUIET)$$(RM) -f -- "$$@"
+        $$(QUIET)$$(VBOX_DEF_2_LAZY_LOAD) --system --library $(2)$(SUFF_DLL).$(3) --output "$$@" $$(VBoxClient_0_OUTDIR)/$(2).def
  endef # VBOXCLIENT_LAZYLOAD_GEN_ASM_FN
 
@@ -228 +228 @@
  # Note: Solaris does *not* have any of those libs with a version suffix, so simply keep those empty (= unset) then.
  if1of ($(KBUILD_TARGET), linux)
-  LIBX11_VER=6
-  LIBXT_VER=6
-  LIBXMU_VER=6
-  LIBXRANDR_VER=2
+  LIBX11_VER = 6
+  LIBXT_VER = 6
+  LIBXMU_VER = 6
+  LIBXRANDR_VER = 2
  endif
  ## Dynamic import no. 1: libX11.so.6