VirtualBox

Changeset 98241 in vbox for trunk/src


Ignore:
Timestamp:
Jan 23, 2023 12:56:35 PM (2 years 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/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • 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