Changeset 100585 in vbox

Timestamp:

Jul 14, 2023 2:43:03 PM (21 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158415

Message:

Additions/VBoxClient: Altering the .def files is not necessary, as VBoxDef2LazyLoad ignores the LIBRARY directive and uses the --library parameter for it instead. bugref:10427

Location:

trunk/src/VBox

Files:

• Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)
• GuestHost/libX11.def (modified) (1 diff)
• GuestHost/libXmu.def (modified) (1 diff)
• GuestHost/libXrandr.def (modified) (2 diffs)
• GuestHost/libXt.def (modified) (2 diffs)

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

@@ -209 +209 @@
         $$(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 -> $$@)
+  $$$$(VBoxClient_0_OUTDIR)/$(2)LazyLoad.asm: $$(PATH_ROOT)/src/VBox/GuestHost/$(2).def $(VBOX_DEF_2_LAZY_LOAD) | $$$$(dir $$@)
+        $$(call MSG_TOOL,VBoxDef2LazyLoad,$$(PATH_ROOT)/src/VBox/GuestHost/$(2).def,$$@)
+        $$(eval VBOX_VBOXCLIENT_LIB_TO_LAZYLOAD_SUFF=$$$$(if $(3),$(SUFF_DLL).$(3),$(SUFF_DLL)))
         $$(QUIET)$$(RM) -f -- "$$@"
-        $$(QUIET)$$(VBOX_DEF_2_LAZY_LOAD) --system --library $(2)$(SUFF_DLL).$(3) --output "$$@" $$(VBoxClient_0_OUTDIR)/$(2).def
+        $$(VBOX_DEF_2_LAZY_LOAD) --system --library $(2)$$(VBOX_VBOXCLIENT_LIB_TO_LAZYLOAD_SUFF) --output "$$@" $$(PATH_ROOT)/src/VBox/GuestHost/$(2).def
  endef # VBOXCLIENT_LAZYLOAD_GEN_ASM_FN
 

trunk/src/VBox/GuestHost/libX11.def

@@ -26 +26 @@
 ;
 
-LIBRARY @VBOX_LAZYLOAD_DEF_LIB_STRING@
+LIBRARY libX11.so.ignoredByDef2LazyLoad
 EXPORTS
     _XData32

trunk/src/VBox/GuestHost/libXmu.def

@@ -25 +25 @@
 ; SPDX-License-Identifier: GPL-3.0-only
 ;
-LIBRARY @VBOX_LAZYLOAD_DEF_LIB_STRING@
+LIBRARY libXmu.so.ignoredByDef2LazyLoad
 EXPORTS
     XmuClientWindow
+

trunk/src/VBox/GuestHost/libXrandr.def

@@ -25 +25 @@
 ; SPDX-License-Identifier: GPL-3.0-only
 ;
-LIBRARY @VBOX_LAZYLOAD_DEF_LIB_STRING@
+LIBRARY libXrandr.so.ignoredByDef2LazyLoad
 EXPORTS
     XRRAddOutputMode
@@ -48 +48 @@
     XRRSetScreenSize
     XRRUpdateConfiguration
+

trunk/src/VBox/GuestHost/libXt.def

@@ -25 +25 @@
 ; SPDX-License-Identifier: GPL-3.0-only
 ;
-LIBRARY @VBOX_LAZYLOAD_DEF_LIB_STRING@
+LIBRARY libXt.so.ignoredByDef2LazyLoad
 EXPORTS
     applicationShellWidgetClass         DATA
@@ -52 +52 @@
     XtVaAppCreateShell
     XtWindow
+