Changeset 93016 in vbox for trunk

Timestamp:

Dec 17, 2021 12:25:10 PM (3 years ago)

Author:

vboxsync

Message:

libs/libssh: bugref:9469 libssh tunnel and other patches

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -816 +816 @@
 # Enable cURL (required for the network part of the GUI)
 VBOX_WITH_LIBCURL = 1
+# Enable libssh (required for cloud network attachment)
+VBOX_WITH_LIBSSH = 1
 # Enable Host=>Guest Drag'n'Drop
 if1of ($(KBUILD_TARGET), darwin linux solaris win)
@@ -4585 +4587 @@
  SDK_VBOX_TPMS_INCS         ?= $(SDK_VBOX_TPMS_DEFAULT_INCS)
  SDK_VBOX_TPMS_LIBS         ?= $(PATH_STAGE_LIB)/VBox-libtpms$(VBOX_SUFF_LIB)
+endif
+
+ifdef VBOX_WITH_LIBSSH
+ SDK_VBOX_SSH               = .
+ SDK_VBOX_SSH_INCS         ?= $(PATH_ROOT)/src/libs/libssh-0.9.5/include
+ SDK_VBOX_SSH_LIBS         ?= $(PATH_STAGE_LIB)/VBox-libssh$(VBOX_SUFF_LIB)
+
+ SDK_VBOX_SSH_STATIC         = .
+ SDK_VBOX_SSH_STATIC_EXTENDS ?= VBOX_SSH
+ SDK_VBOX_SSH_STATIC_LIBS    ?= $(PATH_STAGE_LIB)/VBox-libssh-static$(VBOX_SUFF_LIB)
 endif
 

trunk/src/libs/Makefile.kmk

@@ -109 +109 @@
 endif
 
+include $(PATH_SUB_CURRENT)/libssh-0.9.5/Makefile.kmk
+
 include $(FILE_KBUILD_SUB_FOOTER)