VirtualBox

Changeset 74741 in vbox for trunk


Ignore:
Timestamp:
Oct 10, 2018 12:50:44 PM (6 years ago)
Author:
vboxsync
Message:

reverted r125671 to fix commit msg

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r74739 r74741  
    51645164TEMPLATE_VBoxR3Static_LIBS         += \
    51655165        $(VBOX_LIB_RUNTIME_STATIC)
     5166ifndef SDK_VBOX_OPENSSL_LIBS
     5167 TEMPLATE_VBoxR3Static_LIBS        += \
     5168        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
     5169        $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
     5170endif
    51665171ifndef SDK_VBOX_LIBXML2_LIBS
    51675172 TEMPLATE_VBoxR3Static_LIBS        += \
  • trunk/src/VBox/Runtime/Makefile.kmk

    r74739 r74741  
    259259#
    260260RuntimeR3_TEMPLATE      = VBoxR3Static
    261 RuntimeR3_SDKS          = VBOX_LIBXML2
     261RuntimeR3_SDKS          = VBOX_OPENSSL VBOX_LIBXML2
    262262RuntimeR3_SDKS.win      = $(VBOX_WINPSDK) $(VBOX_WINDDK)
    263263RuntimeR3_DEFS          = \
     
    271271        RT_NO_GIP \
    272272        RT_WITHOUT_NOCRT_WRAPPERS \
     273        IPRT_WITH_OPENSSL \
    273274        NOFILEID
    274275if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
     
    15191520RuntimeBldProg_BLD_TRG_ARCH    := $(KBUILD_HOST_ARCH)
    15201521RuntimeBldProg_BLD_TRG_CPU     := $(KBUILD_HOST_CPU)
    1521 RuntimeBldProg_DEFS            := $(filter-out IN_SUP_R3 IN_SUP, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
     1522RuntimeBldProg_DEFS            := $(filter-out IN_SUP_R3 IN_SUP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS)) IPRT_WITHOUT_LDR_VERIFY RT_NO_GIP
    15221523RuntimeBldProg_SOURCES         = \
    15231524        common/alloc/alloc.cpp \
     
    19661967## @todo change this to EXTEND the RuntimeR3 target.
    19671968RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
    1968 RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP, $(RuntimeR3_DEFS))
     1969RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS))
    19691970RuntimeGuestR3_DEFS                     := $(filter-out IN_SUP_R3, $(RuntimeGuestR3_DEFS))
    19701971RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
     
    20422043endif
    20432044VBoxRT_DEFS                   := $(filter-out RT_NO_GIP, $(RuntimeR3_DEFS)) \
    2044         IPRT_WITH_OPENSSL \
    20452045        IPRT_WITH_XAR \
    20462046        $(if-expr !defined(VBOX_WITH_ALT_HASH_CODE),IPRT_WITHOUT_SHA512T224 IPRT_WITHOUT_SHA512T256,)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette