VirtualBox

Changeset 98241 in vbox for trunk


Ignore:
Timestamp:
Jan 23, 2023 12:56:35 PM (21 months ago)
Author:
vboxsync
Message:

*.kmk,configure*: s/VBOX_OPENSSL2/VBoxOpenSsl/ s/VBOX_OPENSSL-x86/VBoxOpenSslStatic-x86/ s/VBOX_OPENSSL/VBoxOpenSslStatic/ s/VBOX_OPENSSL_BLDPROG/VBoxOpenSslBldProg/ (SDKs) bugref:10348

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98240 r98241  
    49244924
    49254925# openssl
    4926 SDK_VBOX_OPENSSL                        := OpenSSL - Only for VBoxRT and/or statically linked programs.
    4927 SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS      := $(PATH_OUT)/obj/crypto-3.0.7-headers/include
    4928 SDK_VBOX_OPENSSL_INCS                   ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
    4929 SDK_VBOX_OPENSSL_ORDERDEPS              ?= $(crypto-headers_1_TARGET)
     4926SDK_VBoxOpenSslStatic                        := OpenSSL - Only for VBoxRT and/or statically linked programs.
     4927SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS      := $(PATH_OUT)/obj/crypto-3.0.7-headers/include
     4928SDK_VBoxOpenSslStatic_INCS                   ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
     4929SDK_VBoxOpenSslStatic_ORDERDEPS              ?= $(crypto-headers_1_TARGET)
    49304930if  !defined(VBOX_ONLY_SDK) \
    49314931 && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \
    49324932 && (!defined(VBOX_ONLY_EXTPACKS) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
    4933  && ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)")
    4934  SDK_VBOX_OPENSSL_DEPS                  ?= $(SDK_VBOX_OPENSSL_INCS)/openssl/openssl-mangling.h
    4935 endif
    4936 SDK_VBOX_OPENSSL_LIBS                   ?= \
     4933 && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
     4934 SDK_VBoxOpenSslStatic_DEPS                  ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h
     4935endif
     4936SDK_VBoxOpenSslStatic_LIBS                   ?= \
    49374937        $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) \
    49384938        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)
    49394939
    4940 SDK_VBOX_OPENSSL-x86                    := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs.
    4941 SDK_VBOX_OPENSSL-x86_VBOX_DEFAULT_INCS  := $(PATH_OUT)/obj/crypto-3.0.7-headers/include
    4942 SDK_VBOX_OPENSSL-x86_INCS               ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
    4943 SDK_VBOX_OPENSSL-x86_ORDERDEPS          ?= $(crypto-headers_1_TARGET)
    4944 if ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)")
    4945  SDK_VBOX_OPENSSL-x86_DEPS              ?= $(SDK_VBOX_OPENSSL_INCS)/openssl/openssl-mangling.h
    4946 endif
    4947 SDK_VBOX_OPENSSL-x86_LIBS               ?= \
     4940SDK_VBoxOpenSslStatic-x86                    := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs.
     4941SDK_VBoxOpenSslStatic-x86_VBOX_DEFAULT_INCS  := $(PATH_OUT)/obj/crypto-3.0.7-headers/include
     4942SDK_VBoxOpenSslStatic-x86_INCS               ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
     4943SDK_VBoxOpenSslStatic-x86_ORDERDEPS          ?= $(crypto-headers_1_TARGET)
     4944if ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)")
     4945 SDK_VBoxOpenSslStatic-x86_DEPS              ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h
     4946endif
     4947SDK_VBoxOpenSslStatic-x86_LIBS               ?= \
    49484948        $(PATH_STAGE_LIB)/VBox-libssl-x86$(VBOX_SUFF_LIB) \
    49494949        $(PATH_STAGE_LIB)/VBox-libcrypto-x86$(VBOX_SUFF_LIB)
    49504950
    49514951ifdef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING
    4952  SDK_VBOX_OPENSSL_BLDPROG               := OpenSSL - Build tools verison (i.e. bldRTSignTool)
    4953  SDK_VBOX_OPENSSL_BLDPROG_INCS          ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
    4954  SDK_VBOX_OPENSSL_BLDPROG_ORDERDEPS     ?= $(crypto-headers_1_TARGET)
     4952 SDK_VBoxOpenSslBldProg               := OpenSSL - Build tools verison (i.e. bldRTSignTool)
     4953 SDK_VBoxOpenSslBldProg_INCS          ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
     4954 SDK_VBoxOpenSslBldProg_ORDERDEPS     ?= $(crypto-headers_1_TARGET)
    49554955 if  !defined(VBOX_ONLY_SDK) \
    4956   && ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)")
    4957   SDK_VBOX_OPENSSL_BLDPROG_DEPS         ?= $(SDK_VBOX_OPENSSL_INCS)/openssl/openssl-mangling.h
    4958  endif
    4959  SDK_VBOX_OPENSSL_BLDPROG_LIBS          ?= \
     4956  && ("$(SDK_VBoxOpenSsl_INCS)" == "$(SDK_VBoxOpenSsl_VBOX_DEFAULT_INCS)")
     4957  SDK_VBoxOpenSslBldProg_DEPS         ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h
     4958 endif
     4959 SDK_VBoxOpenSslBldProg_LIBS          ?= \
    49604960        $(PATH_STAGE_LIB)/VBoxBldProg-libssl$(VBOX_SUFF_LIB) \
    49614961        $(PATH_STAGE_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB)
    49624962endif
    49634963
    4964 SDK_VBOX_OPENSSL2              := This is what you should be using!  It links against VBoxRT.
    4965 SDK_VBOX_OPENSSL2_EXTENDS      := VBOX_OPENSSL
    4966 if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
    4967  SDK_VBOX_OPENSSL2_LIBS         = $(NO_SUCH_VARIABLE)
     4964SDK_VBoxOpenSsl              := This is what you should be using!  It links against VBoxRT.
     4965SDK_VBoxOpenSsl_EXTENDS      := VBoxOpenSslStatic
     4966if "$(SDK_VBoxOpenSsl_INCS)" == "$(SDK_VBoxOpenSsl_VBOX_DEFAULT_INCS)"
     4967 SDK_VBoxOpenSsl_LIBS         = $(NO_SUCH_VARIABLE)
    49684968endif
    49694969
     
    65696569TEMPLATE_VBoxR3Static_EXTENDS       = VBoxR3StaticBase
    65706570TEMPLATE_VBoxR3Static_EXTENDS_BY    = appending
    6571 TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH) += VBOX_OPENSSL
     6571TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH) += VBoxOpenSslStatic
    65726572TEMPLATE_VBoxR3Static_SDKS.win     += VBOX_NTDLL
    65736573ifeq ($(KBUILD_TARGET),win)
     
    66776677TEMPLATE_VBoxR3StaticNoCrt_EXTENDS       = VBoxR3Static
    66786678TEMPLATE_VBoxR3StaticNoCrt_SDKS          = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(TEMPLATE_VBoxR3Static_SDKS))
    6679 TEMPLATE_VBoxR3StaticNoCrt_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
     6679TEMPLATE_VBoxR3StaticNoCrt_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
    66806680TEMPLATE_VBoxR3StaticNoCrt_DEFS          = $(TEMPLATE_VBoxR3Static_DEFS) \
    66816681        RT_NO_CRT \
     
    68676867TEMPLATE_VBoxR3AutoTest  = VBox Ring 3 Testcase Exe
    68686868TEMPLATE_VBoxR3AutoTest_EXTENDS    := VBoxR3Static
    6869 TEMPLATE_VBoxR3AutoTest_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBOX_OPENSSL,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_SDKS.$(KBUILD_TARGET_ARCH)))
     6869TEMPLATE_VBoxR3AutoTest_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_SDKS.$(KBUILD_TARGET_ARCH)))
    68706870ifeq ($(KBUILD_TARGET),win)
    68716871 if "$(KBUILD_HOST_VERSION)" vlt "10.0.0.0.10240"  # The windows ASAN requires windows 10 APIs to work.
     
    79987998 TEMPLATE_VBoxNLS_SOURCES  = \
    79997999        $(PATH_ROOT)/src/VBox/Main/nls/dummy.c
    8000  TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH)  = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
     8000 TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH)  = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
    80018001 ifdef VBOX_WITH_NOCRT_STATIC
    80028002  TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
     
    85848584TEMPLATE_VBoxGuestR3NoCrtExe_EXTENDS        := VBoxGuestR3Exe
    85858585TEMPLATE_VBoxGuestR3NoCrtExe_SDKS            = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(TEMPLATE_VBoxGuestR3Exe_SDKS))
    8586 TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxGuestR3Exe_SDKS.$(KBUILD_TARGET_ARCH)))
     8586TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxGuestR3Exe_SDKS.$(KBUILD_TARGET_ARCH)))
    85878587TEMPLATE_VBoxGuestR3NoCrtExe_DEFS            = $(TEMPLATE_VBoxGuestR3Exe_DEFS) \
    85888588        RT_NO_CRT \
  • trunk/configure

    r98240 r98241  
    889889    if test_compile "$INCCRYPTO $LIBCRYPTO" libcrypto openssl; then
    890890      if test_execute nofatal; then
    891         cnf_append "SDK_VBOX_OPENSSL_INCS" "`strip_I "$INCCRYPTO"`"
    892         cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
    893         cnf_append "SDK_VBOX_BLD_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
     891        cnf_append "SDK_VBoxOpenSslStatic_INCS" "`strip_I "$INCCRYPTO"`"
     892        cnf_append "SDK_VBoxOpenSslStatic_LIBS" "`strip_l "$LIBCRYPTO"`"
     893        cnf_append "SDK_VBoxOpenSslBldProg_LIBS" "`strip_l "$LIBCRYPTO"`"
    894894      fi
    895895    fi
  • trunk/configure.vbs

    r98238 r98241  
    16561656   strPathSsl = UnixSlashes(PathAbs(strPathSsl))
    16571657   if bln32Bit = True then
    1658       CfgPrintAssign "SDK_VBOX_OPENSSL-x86_INCS",     strPathSsl & "/include"
    1659       CfgPrintAssign "SDK_VBOX_OPENSSL-x86_LIBS",     strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
    1660       CfgPrintAssign "SDK_VBOX_BLD_OPENSSL-x86_LIBS", strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
     1658      CfgPrintAssign "SDK_VBoxOpenSslStatic-x86_INCS",     strPathSsl & "/include"
     1659      CfgPrintAssign "SDK_VBoxOpenSslStatic-x86_LIBS",     strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
     1660      CfgPrintAssign "SDK_VBoxOpenSslBldProg-x86_LIBS", strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
    16611661   else
    1662       CfgPrintAssign "SDK_VBOX_OPENSSL_INCS",         strPathSsl & "/include"
    1663       CfgPrintAssign "SDK_VBOX_OPENSSL_LIBS",         strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
    1664       CfgPrintAssign "SDK_VBOX_BLD_OPENSSL_LIBS",     strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
     1662      CfgPrintAssign "SDK_VBoxOpenSslStatic_INCS",         strPathSsl & "/include"
     1663      CfgPrintAssign "SDK_VBoxOpenSslStatic_LIBS",         strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
     1664      CfgPrintAssign "SDK_VBoxOpenSslBldProg_LIBS",     strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"
    16651665   end if
    16661666
  • trunk/src/VBox/Devices/Makefile.kmk

    r98236 r98241  
    577577
    578578 if defined(VBOX_WITH_CLOUD_NET) && defined(VBOX_WITH_LIBSSH)
    579   VBoxDD_SDKS           += VBOX_SSH VBOX_ZLIB VBOX_OPENSSL2
     579  VBoxDD_SDKS           += VBOX_SSH VBOX_ZLIB VBoxOpenSsl
    580580  VBoxDD_DEFS           += VBOX_WITH_CLOUD_NET
    581581  VBoxDD_SOURCES        += \
  • trunk/src/VBox/Main/Makefile.kmk

    r98239 r98241  
    10541054
    10551055ifdef VBOX_WITH_OPENSSL_FIPS
    1056 VBoxC_SDKS += VBOX_OPENSSL2
     1056VBoxC_SDKS += VBoxOpenSsl
    10571057endif
    10581058
     
    11641164if defined(VBOX_WITH_CLOUD_NET)
    11651165 if defined(VBOX_WITH_LIBSSH)
    1166   VBoxC_SDKS += VBOX_SSH VBOX_OPENSSL
     1166  VBoxC_SDKS += VBOX_SSH VBoxOpenSsl
    11671167  VBoxC_DEFS += VBOX_WITH_LIBSSH
    11681168 endif
  • trunk/src/VBox/Main/webservice/Makefile.kmk

    r98233 r98241  
    276276  ifdef VBOX_WITH_WEBSERVICES_SSL
    277277   vboxsoap_DEFS += WITH_OPENSSL
    278    vboxsoap_SDKS += VBOX_OPENSSL2
     278   vboxsoap_SDKS += VBoxOpenSsl
    279279  endif
    280280  ifdef VBOX_WITHOUT_SPLIT_SOAPC
     
    419419 ifdef VBOX_WITH_WEBSERVICES_SSL
    420420  vboxwebsrv_DEFS += WITH_OPENSSL
    421   vboxwebsrv_SDKS += VBOX_OPENSSL2
     421  vboxwebsrv_SDKS += VBoxOpenSsl
    422422 endif
    423423 vboxwebsrv_SOURCES = \
     
    595595 ifdef VBOX_WITH_WEBSERVICES_SSL
    596596  webtest_DEFS += WITH_OPENSSL
    597   webtest_SDKS += VBOX_OPENSSL2
     597  webtest_SDKS += VBoxOpenSsl
    598598 endif
    599599 webtest_SOURCES = \
  • trunk/src/VBox/Runtime/Makefile.kmk

    r98240 r98241  
    27662766 VBoxRT_SDKS                  += VBoxLibCurl
    27672767endif
    2768 VBoxRT_SDKS                   += VBOX_OPENSSL
     2768VBoxRT_SDKS                   += VBoxOpenSslStatic
    27692769if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))
    27702770VBoxRT_SDKS                   += VBOX_SOFTFLOAT
     
    28622862VBoxRT_LIBS                   += \
    28632863        $(SDK_VBOX_ZLIB_LIBS)
    2864 ifndef SDK_VBOX_OPENSSL_LIBS
     2864ifndef SDK_VBoxOpenSslStatic_LIBS
    28652865 VBoxRT_LIBS                  += \
    28662866        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
     
    30053005 VBoxRT-x86_SDKS += VBoxLibCurl-x86
    30063006endif
    3007 VBoxRT-x86_SDKS  += VBOX_OPENSSL-x86
     3007VBoxRT-x86_SDKS  += VBoxOpenSslStatic-x86
    30083008
    30093009VBoxRT-x86_LIBS = \
     
    30193019VBoxRT-x86_LIBS                  += \
    30203020        $(SDK_VBOX_ZLIB_LIBS-x86)
    3021 ifndef SDK_VBOX_OPENSSL_LIBS
     3021ifndef SDK_VBoxOpenSslStatic_LIBS
    30223022 VBoxRT-x86_LIBS                 += \
    30233023        $(PATH_STAGE_LIB)/VBox-libcrypto-x86$(VBOX_SUFF_LIB) \
     
    34043404#
    34053405RuntimeR0Drv_TEMPLATE   = VBoxR0DrvLib
    3406 RuntimeR0Drv_SDKS.win   = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS) VBOX_OPENSSL
     3406RuntimeR0Drv_SDKS.win   = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS) VBoxOpenSslStatic ## @todo why OpenSSL in ring-0
    34073407RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID
    34083408RuntimeR0Drv_DEFS.win   = IN_SUP_R0 LDR_ONLY_PE IPRT_WITHOUT_DIGEST_MD4
  • trunk/src/VBox/Runtime/testcase/Makefile.kmk

    r98238 r98241  
    290290tstRTBigNum_TEMPLATE = VBoxR3TstExe
    291291tstRTBigNum_SOURCES = tstRTBigNum.cpp
    292 tstRTBigNum_SDKS = VBOX_OPENSSL2
     292tstRTBigNum_SDKS = VBoxOpenSsl
    293293tstRTBigNum_CXXFLAGS.win = -bigobj
    294294
  • trunk/src/VBox/Runtime/tools/Makefile.kmk

    r98103 r98241  
    9595   bldRTSignTool_DEFS     += IPRT_SIGNTOOL_NO_SIGNING
    9696  else # RuntimeBldProg is missing a lot and is built w/o IPRT_WITH_OPENSSL. So, include missing and rebuilt openssl deps.
    97    bldRTSignTool_SDKS     += VBOX_OPENSSL_BLDPROG
     97   bldRTSignTool_SDKS     += VBoxOpenSslBldProg
    9898   bldRTSignTool_DEFS     += IPRT_WITH_OPENSSL
    9999   bldRTSignTool_SOURCES  += \
  • trunk/src/libs/Makefile.kmk

    r98240 r98241  
    9999 && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \
    100100 && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || defined(VBOX_WITH_BLD_RTSIGNTOOL_SIGNING) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
    101  && ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))
     101 && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))
    102102  include $(PATH_SUB_CURRENT)/openssl-3.0.7/Makefile.kmk
    103103endif
  • trunk/src/libs/curl-7.83.1/Makefile.kmk

    r98227 r98241  
    3333LIBRARIES += VBox-libcurl
    3434VBox-libcurl_TEMPLATE       = VBoxR3RuntimeDllNonPedantic
    35 VBox-libcurl_SDKS           = VBOX_ZLIB VBOX_OPENSSL
     35VBox-libcurl_SDKS           = VBOX_ZLIB VBoxOpenSslStatic
    3636VBox-libcurl_DEFS           = \
    3737        CURL_STATICLIB \
  • trunk/src/libs/libtpms-0.9.0/Makefile.kmk

    r98226 r98241  
    3333LIBRARIES += VBox-libtpms_tpm12 VBox-libtpms_tpm2 VBox-libtpms
    3434VBox-libtpms_tpm12_TEMPLATE       = VBoxR3DllNonPedantic
    35 VBox-libtpms_tpm12_SDKS           = VBOX_OPENSSL2
     35VBox-libtpms_tpm12_SDKS           = VBoxOpenSsl
    3636VBox-libtpms_tpm12_DEFS           = \
    3737        TPM_PCCLIENT \
     
    9999
    100100VBox-libtpms_tpm2_TEMPLATE       = VBoxR3DllNonPedantic
    101 VBox-libtpms_tpm2_SDKS           = VBOX_OPENSSL2
     101VBox-libtpms_tpm2_SDKS           = VBoxOpenSsl
    102102VBox-libtpms_tpm2_DEFS           = \
    103103        TPM_LIBTPMS_CALLBACKS
  • trunk/src/libs/openssl-3.0.7/crypto/Makefile.kmk

    r98229 r98241  
    4646if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
    4747 $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS) crypto_sha)
    48 else if "$(SDK_VBOX_OPENSSL_INCS)" != "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
     48else if "$(SDK_VBoxOpenSslStatic_INCS)" != "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
    4949 $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS))
    5050endif
     
    120120if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
    121121 VBox-libcrypto_SOURCES += $(crypto_sha_1_TARGET)
    122 else if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
     122else if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
    123123 VBox-libcrypto_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $($(sublib)_1_TARGET))
    124124endif
  • trunk/src/libs/openssl-3.0.7/providers/Makefile.kmk

    r98229 r98241  
    4646# $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS) crypto_sha)
    4747#else
    48 if "$(SDK_VBOX_OPENSSL_INCS)" != "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
     48if "$(SDK_VBoxOpenSslStatic_INCS)" != "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
    4949 $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS))
    5050endif
     
    5454# The main target: libproviders.
    5555#
    56 if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
     56if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
    5757 LIBRARIES += VBox-libproviders
    5858endif
  • trunk/src/libs/openssl-3.0.7/ssl/Makefile.kmk

    r98229 r98241  
    3232# The main target: libssl.
    3333#
    34 if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
     34if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
    3535 LIBRARIES += VBox-libssl
    3636endif
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