Changeset 74742 in vbox for trunk/src/VBox

Timestamp:

Oct 10, 2018 12:51:06 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Dropped openssl from the static RuntimR3.lib/a build. bugref:9232

File:

• trunk/src/VBox/Runtime/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -259 +259 @@
 #
 RuntimeR3_TEMPLATE      = VBoxR3Static
-RuntimeR3_SDKS          = VBOX_OPENSSL VBOX_LIBXML2
+RuntimeR3_SDKS          = VBOX_LIBXML2
 RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
 RuntimeR3_DEFS          = \
@@ -271 +271 @@
         RT_NO_GIP \
         RT_WITHOUT_NOCRT_WRAPPERS \
-        IPRT_WITH_OPENSSL \
         NOFILEID
 if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
@@ -1520 +1519 @@
 RuntimeBldProg_BLD_TRG_ARCH    := $(KBUILD_HOST_ARCH)
 RuntimeBldProg_BLD_TRG_CPU     := $(KBUILD_HOST_CPU)
-RuntimeBldProg_DEFS            := $(filter-out IN_SUP_R3 IN_SUP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
+RuntimeBldProg_DEFS            := $(filter-out IN_SUP_R3 IN_SUP, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
 RuntimeBldProg_SOURCES         = \
         common/alloc/alloc.cpp \
@@ -1967 +1966 @@
 ## @todo change this to EXTEND the RuntimeR3 target.
 RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
-RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS))
+RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP, $(RuntimeR3_DEFS))
 RuntimeGuestR3_DEFS                     := $(filter-out IN_SUP_R3, $(RuntimeGuestR3_DEFS))
 RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
@@ -2043 +2042 @@
 endif
 VBoxRT_DEFS                   := $(filter-out RT_NO_GIP, $(RuntimeR3_DEFS)) \
+        IPRT_WITH_OPENSSL \
         IPRT_WITH_XAR \
         $(if-expr !defined(VBOX_WITH_ALT_HASH_CODE),IPRT_WITHOUT_SHA512T224 IPRT_WITHOUT_SHA512T256,)