Changeset 96910 in vbox for trunk

Timestamp:

Sep 28, 2022 8:01:10 AM (2 years ago)

Author:

vboxsync

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

153820

Message:

CloudNet,libs/libssh: bugref:9469 Build libssh as separate DLL and load it explicitly

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/Network/VBoxLibSsh.def (added)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/src-all/VBoxLibSsh.def (added)

trunk/Config.kmk

@@ -4911 +4911 @@
 
 ifdef VBOX_WITH_LIBSSH
- SDK_VBOX_SSH                  := libssh for dll linking.
- SDK_VBOX_SSH_DEFS             ?= LIBSSH_STATIC=1
+ SDK_VBOX_SSH                  := libssh for dynamic dll loading with assembly stubs.
  SDK_VBOX_SSH_INCS             ?= $(PATH_ROOT)/src/libs/libssh-0.9.6/include
- SDK_VBOX_SSH_LIBS             ?= \
-        $(PATH_STAGE_LIB)/VBox-libssh$(VBOX_SUFF_LIB)
+# SDK_VBOX_SSH_LIBS is not defined, as VBoxLibSsh dll is not linked, but loaded explicitly
+# by auto-generated stub code (lazy loading)
 endif
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -580 +580 @@
   VBoxDD_SOURCES        += \
         Network/DrvCloudTunnel.cpp
+
+  VBoxDD_SOURCES       += \
+        $(VBoxDD_0_OUTDIR)/VBoxLibSshLazyLoad.asm
+  VBoxDD_CLEAN         += $(VBoxDD_0_OUTDIR)/VBoxLibSshLazyLoad.asm
+  $$(VBoxDD_0_OUTDIR)/VBoxLibSshLazyLoad.asm: $(PATH_SUB_CURRENT)/Network/VBoxLibSsh.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxDD,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --explicit-load-function --library VBoxLibSsh --output "$@" $(filter %.def, $^)
  endif
 

trunk/src/VBox/Main/Makefile.kmk

@@ -1165 +1165 @@
  if defined(VBOX_WITH_LIBSSH)
   VBoxC_SDKS += VBOX_SSH VBOX_OPENSSL
-  VBoxC_DEFS += LIBSSH_STATIC VBOX_WITH_LIBSSH
+  VBoxC_DEFS += VBOX_WITH_LIBSSH
  endif
  VBoxC_SOURCES += src-client/CloudGateway.cpp
+
+ VBoxC_SOURCES       += \
+        $(VBoxC_0_OUTDIR)/VBoxLibSshLazyLoad.asm
+ VBoxC_CLEAN         += $(VBoxC_0_OUTDIR)/VBoxLibSshLazyLoad.asm
+ $$(VBoxC_0_OUTDIR)/VBoxLibSshLazyLoad.asm: $(PATH_SUB_CURRENT)/src-all/VBoxLibSsh.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxC,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --explicit-load-function --library VBoxLibSsh --output "$@" $(filter %.def, $^)
+
 endif