Changeset 74324 in vbox

Timestamp:

Sep 17, 2018 9:06:52 PM (7 years ago)

Author:

vboxsync

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

125133

Message:

Config.kmk,libs/*.kmk: Only build the extpack openssl libraries if we need them (VBOX_NEED_EXTPACK_OPENSSL). bugref:9246

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -1331 +1331 @@
  VBOX_WITH_VALIDATIONKIT = $(VBOX_WITH_TESTSUITE)
 endif
+
+
+#
+# Derived indicators.
+#
+
+## Indicates that we need the extpack openssl libs.
+if   defined(VBOX_WITH_EXTPACK_PUEL_BUILD) \
+ && (   !defined(VRDP_WITH_IPRT_CRYPTO) \
+     || !defined(VRDP_WITH_IPRT_SSL) \
+     || !defined(VD_WITH_IPRT_CRYPTO) )
+ VBOX_NEED_EXTPACK_OPENSSL = 1
+else
+ VBOX_NEED_EXTPACK_OPENSSL =
+endif
+
 
 #
@@ -5362 +5378 @@
  TEMPLATE_VBOXR3AUTOTST_EXTENDS = VBoxR3Static
  TEMPLATE_VBOXR3AUTOTST_LIBS    = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBOXR3AUTOTST_SDKS    = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS))
 else
  TEMPLATE_VBOXR3AUTOTST_EXTENDS = VBOXR3EXE
@@ -6102 +6119 @@
   TEMPLATE_VBoxR3ExtPackPuelWithOpenSsl = For the ring-3 context modules in the PUEL extension pack using ExtPack OpenSSL.
   TEMPLATE_VBoxR3ExtPackPuelWithOpenSsl_EXTENDS = VBoxR3ExtPackPuel
-  TEMPLATE_VBoxR3ExtPackPuelWithOpenSsl_INCS = \
-        $(TEMPLATE_VBoxR3ExtPack_INCS) \
-        $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
-  TEMPLATE_VBoxR3ExtPackPuelWithOpenSsl_LIBS = \
-        $(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB) \
-        $(TEMPLATE_VBoxR3ExtPack_LIBS) # Must come after the two libraries or we'll pick up SSL from VBoxRT!
+  ifdef VBOX_NEED_EXTPACK_OPENSSL
+   TEMPLATE_VBoxR3ExtPackPuelWithOpenSsl_INCS = \
+        $(TEMPLATE_VBoxR3ExtPack_INCS) \
+        $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
+   TEMPLATE_VBoxR3ExtPackPuelWithOpenSsl_LIBS = \
+        $(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB) \
+        $(TEMPLATE_VBoxR3ExtPack_LIBS) # Must come after the two libraries or we'll pick up SSL from VBoxRT!
+  endif
 
   TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.

trunk/src/libs/Makefile.kmk

@@ -59 +59 @@
 if  !defined(VBOX_ONLY_SDK) \
  && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \
- && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
-     || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
+ && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
+ && ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))
  include $(PATH_SUB_CURRENT)/openssl-1.1.0h/Makefile.kmk
 endif