- Timestamp:
- Jan 23, 2023 12:56:35 PM (21 months ago)
- Location:
- trunk
- Files:
-
- 15 edited
-
Config.kmk (modified) (6 diffs)
-
configure (modified) (1 diff)
-
configure.vbs (modified) (1 diff)
-
src/VBox/Devices/Makefile.kmk (modified) (1 diff)
-
src/VBox/Main/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Main/webservice/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Runtime/Makefile.kmk (modified) (5 diffs)
-
src/VBox/Runtime/testcase/Makefile.kmk (modified) (1 diff)
-
src/VBox/Runtime/tools/Makefile.kmk (modified) (1 diff)
-
src/libs/Makefile.kmk (modified) (1 diff)
-
src/libs/curl-7.83.1/Makefile.kmk (modified) (1 diff)
-
src/libs/libtpms-0.9.0/Makefile.kmk (modified) (2 diffs)
-
src/libs/openssl-3.0.7/crypto/Makefile.kmk (modified) (2 diffs)
-
src/libs/openssl-3.0.7/providers/Makefile.kmk (modified) (2 diffs)
-
src/libs/openssl-3.0.7/ssl/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98240 r98241 4924 4924 4925 4925 # openssl 4926 SDK_VB OX_OPENSSL:= OpenSSL - Only for VBoxRT and/or statically linked programs.4927 SDK_VB OX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.0.7-headers/include4928 SDK_VB OX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)4929 SDK_VB OX_OPENSSL_ORDERDEPS ?= $(crypto-headers_1_TARGET)4926 SDK_VBoxOpenSslStatic := OpenSSL - Only for VBoxRT and/or statically linked programs. 4927 SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.0.7-headers/include 4928 SDK_VBoxOpenSslStatic_INCS ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS) 4929 SDK_VBoxOpenSslStatic_ORDERDEPS ?= $(crypto-headers_1_TARGET) 4930 4930 if !defined(VBOX_ONLY_SDK) \ 4931 4931 && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \ 4932 4932 && (!defined(VBOX_ONLY_EXTPACKS) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \ 4933 && ("$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)")4934 SDK_VB OX_OPENSSL_DEPS ?= $(SDK_VBOX_OPENSSL_INCS)/openssl/openssl-mangling.h4935 endif 4936 SDK_VB OX_OPENSSL_LIBS ?= \4933 && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)") 4934 SDK_VBoxOpenSslStatic_DEPS ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h 4935 endif 4936 SDK_VBoxOpenSslStatic_LIBS ?= \ 4937 4937 $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) \ 4938 4938 $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) 4939 4939 4940 SDK_VB OX_OPENSSL-x86 := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs.4941 SDK_VB OX_OPENSSL-x86_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.0.7-headers/include4942 SDK_VB OX_OPENSSL-x86_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)4943 SDK_VB OX_OPENSSL-x86_ORDERDEPS ?= $(crypto-headers_1_TARGET)4944 if ("$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)")4945 SDK_VB OX_OPENSSL-x86_DEPS ?= $(SDK_VBOX_OPENSSL_INCS)/openssl/openssl-mangling.h4946 endif 4947 SDK_VB OX_OPENSSL-x86_LIBS ?= \4940 SDK_VBoxOpenSslStatic-x86 := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs. 4941 SDK_VBoxOpenSslStatic-x86_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-3.0.7-headers/include 4942 SDK_VBoxOpenSslStatic-x86_INCS ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS) 4943 SDK_VBoxOpenSslStatic-x86_ORDERDEPS ?= $(crypto-headers_1_TARGET) 4944 if ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)") 4945 SDK_VBoxOpenSslStatic-x86_DEPS ?= $(SDK_VBoxOpenSslStatic_INCS)/openssl/openssl-mangling.h 4946 endif 4947 SDK_VBoxOpenSslStatic-x86_LIBS ?= \ 4948 4948 $(PATH_STAGE_LIB)/VBox-libssl-x86$(VBOX_SUFF_LIB) \ 4949 4949 $(PATH_STAGE_LIB)/VBox-libcrypto-x86$(VBOX_SUFF_LIB) 4950 4950 4951 4951 ifdef VBOX_WITH_BLD_RTSIGNTOOL_SIGNING 4952 SDK_VB OX_OPENSSL_BLDPROG:= OpenSSL - Build tools verison (i.e. bldRTSignTool)4953 SDK_VB OX_OPENSSL_BLDPROG_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)4954 SDK_VB OX_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) 4955 4955 if !defined(VBOX_ONLY_SDK) \ 4956 && ("$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)")4957 SDK_VB OX_OPENSSL_BLDPROG_DEPS ?= $(SDK_VBOX_OPENSSL_INCS)/openssl/openssl-mangling.h4958 endif 4959 SDK_VB OX_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 ?= \ 4960 4960 $(PATH_STAGE_LIB)/VBoxBldProg-libssl$(VBOX_SUFF_LIB) \ 4961 4961 $(PATH_STAGE_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB) 4962 4962 endif 4963 4963 4964 SDK_VB OX_OPENSSL2:= This is what you should be using! It links against VBoxRT.4965 SDK_VB OX_OPENSSL2_EXTENDS := VBOX_OPENSSL4966 if "$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"4967 SDK_VB OX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)4964 SDK_VBoxOpenSsl := This is what you should be using! It links against VBoxRT. 4965 SDK_VBoxOpenSsl_EXTENDS := VBoxOpenSslStatic 4966 if "$(SDK_VBoxOpenSsl_INCS)" == "$(SDK_VBoxOpenSsl_VBOX_DEFAULT_INCS)" 4967 SDK_VBoxOpenSsl_LIBS = $(NO_SUCH_VARIABLE) 4968 4968 endif 4969 4969 … … 6569 6569 TEMPLATE_VBoxR3Static_EXTENDS = VBoxR3StaticBase 6570 6570 TEMPLATE_VBoxR3Static_EXTENDS_BY = appending 6571 TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH) += VB OX_OPENSSL6571 TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH) += VBoxOpenSslStatic 6572 6572 TEMPLATE_VBoxR3Static_SDKS.win += VBOX_NTDLL 6573 6573 ifeq ($(KBUILD_TARGET),win) … … 6677 6677 TEMPLATE_VBoxR3StaticNoCrt_EXTENDS = VBoxR3Static 6678 6678 TEMPLATE_VBoxR3StaticNoCrt_SDKS = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(TEMPLATE_VBoxR3Static_SDKS)) 6679 TEMPLATE_VBoxR3StaticNoCrt_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VB OX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))6679 TEMPLATE_VBoxR3StaticNoCrt_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH))) 6680 6680 TEMPLATE_VBoxR3StaticNoCrt_DEFS = $(TEMPLATE_VBoxR3Static_DEFS) \ 6681 6681 RT_NO_CRT \ … … 6867 6867 TEMPLATE_VBoxR3AutoTest = VBox Ring 3 Testcase Exe 6868 6868 TEMPLATE_VBoxR3AutoTest_EXTENDS := VBoxR3Static 6869 TEMPLATE_VBoxR3AutoTest_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VB OX_OPENSSL,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_SDKS.$(KBUILD_TARGET_ARCH)))6869 TEMPLATE_VBoxR3AutoTest_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_$(TEMPLATE_VBoxR3AutoTest_EXTENDS)_SDKS.$(KBUILD_TARGET_ARCH))) 6870 6870 ifeq ($(KBUILD_TARGET),win) 6871 6871 if "$(KBUILD_HOST_VERSION)" vlt "10.0.0.0.10240" # The windows ASAN requires windows 10 APIs to work. … … 7998 7998 TEMPLATE_VBoxNLS_SOURCES = \ 7999 7999 $(PATH_ROOT)/src/VBox/Main/nls/dummy.c 8000 TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VB OX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))8000 TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH))) 8001 8001 ifdef VBOX_WITH_NOCRT_STATIC 8002 8002 TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \ … … 8584 8584 TEMPLATE_VBoxGuestR3NoCrtExe_EXTENDS := VBoxGuestR3Exe 8585 8585 TEMPLATE_VBoxGuestR3NoCrtExe_SDKS = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(TEMPLATE_VBoxGuestR3Exe_SDKS)) 8586 TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VB OX_OPENSSL,$(TEMPLATE_VBoxGuestR3Exe_SDKS.$(KBUILD_TARGET_ARCH)))8586 TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxGuestR3Exe_SDKS.$(KBUILD_TARGET_ARCH))) 8587 8587 TEMPLATE_VBoxGuestR3NoCrtExe_DEFS = $(TEMPLATE_VBoxGuestR3Exe_DEFS) \ 8588 8588 RT_NO_CRT \ -
trunk/configure
r98240 r98241 889 889 if test_compile "$INCCRYPTO $LIBCRYPTO" libcrypto openssl; then 890 890 if test_execute nofatal; then 891 cnf_append "SDK_VB OX_OPENSSL_INCS" "`strip_I "$INCCRYPTO"`"892 cnf_append "SDK_VB OX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"893 cnf_append "SDK_VB OX_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"`" 894 894 fi 895 895 fi -
trunk/configure.vbs
r98238 r98241 1656 1656 strPathSsl = UnixSlashes(PathAbs(strPathSsl)) 1657 1657 if bln32Bit = True then 1658 CfgPrintAssign "SDK_VB OX_OPENSSL-x86_INCS", strPathSsl & "/include"1659 CfgPrintAssign "SDK_VB OX_OPENSSL-x86_LIBS", strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"1660 CfgPrintAssign "SDK_VB OX_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" 1661 1661 else 1662 CfgPrintAssign "SDK_VB OX_OPENSSL_INCS", strPathSsl & "/include"1663 CfgPrintAssign "SDK_VB OX_OPENSSL_LIBS", strPathSsl & "/lib/libcrypto.lib" & " " & strPathSsl & "/lib/libssl.lib"1664 CfgPrintAssign "SDK_VB OX_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" 1665 1665 end if 1666 1666 -
trunk/src/VBox/Devices/Makefile.kmk
r98236 r98241 577 577 578 578 if defined(VBOX_WITH_CLOUD_NET) && defined(VBOX_WITH_LIBSSH) 579 VBoxDD_SDKS += VBOX_SSH VBOX_ZLIB VB OX_OPENSSL2579 VBoxDD_SDKS += VBOX_SSH VBOX_ZLIB VBoxOpenSsl 580 580 VBoxDD_DEFS += VBOX_WITH_CLOUD_NET 581 581 VBoxDD_SOURCES += \ -
trunk/src/VBox/Main/Makefile.kmk
r98239 r98241 1054 1054 1055 1055 ifdef VBOX_WITH_OPENSSL_FIPS 1056 VBoxC_SDKS += VB OX_OPENSSL21056 VBoxC_SDKS += VBoxOpenSsl 1057 1057 endif 1058 1058 … … 1164 1164 if defined(VBOX_WITH_CLOUD_NET) 1165 1165 if defined(VBOX_WITH_LIBSSH) 1166 VBoxC_SDKS += VBOX_SSH VB OX_OPENSSL1166 VBoxC_SDKS += VBOX_SSH VBoxOpenSsl 1167 1167 VBoxC_DEFS += VBOX_WITH_LIBSSH 1168 1168 endif -
trunk/src/VBox/Main/webservice/Makefile.kmk
r98233 r98241 276 276 ifdef VBOX_WITH_WEBSERVICES_SSL 277 277 vboxsoap_DEFS += WITH_OPENSSL 278 vboxsoap_SDKS += VB OX_OPENSSL2278 vboxsoap_SDKS += VBoxOpenSsl 279 279 endif 280 280 ifdef VBOX_WITHOUT_SPLIT_SOAPC … … 419 419 ifdef VBOX_WITH_WEBSERVICES_SSL 420 420 vboxwebsrv_DEFS += WITH_OPENSSL 421 vboxwebsrv_SDKS += VB OX_OPENSSL2421 vboxwebsrv_SDKS += VBoxOpenSsl 422 422 endif 423 423 vboxwebsrv_SOURCES = \ … … 595 595 ifdef VBOX_WITH_WEBSERVICES_SSL 596 596 webtest_DEFS += WITH_OPENSSL 597 webtest_SDKS += VB OX_OPENSSL2597 webtest_SDKS += VBoxOpenSsl 598 598 endif 599 599 webtest_SOURCES = \ -
trunk/src/VBox/Runtime/Makefile.kmk
r98240 r98241 2766 2766 VBoxRT_SDKS += VBoxLibCurl 2767 2767 endif 2768 VBoxRT_SDKS += VB OX_OPENSSL2768 VBoxRT_SDKS += VBoxOpenSslStatic 2769 2769 if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS)) 2770 2770 VBoxRT_SDKS += VBOX_SOFTFLOAT … … 2862 2862 VBoxRT_LIBS += \ 2863 2863 $(SDK_VBOX_ZLIB_LIBS) 2864 ifndef SDK_VB OX_OPENSSL_LIBS2864 ifndef SDK_VBoxOpenSslStatic_LIBS 2865 2865 VBoxRT_LIBS += \ 2866 2866 $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \ … … 3005 3005 VBoxRT-x86_SDKS += VBoxLibCurl-x86 3006 3006 endif 3007 VBoxRT-x86_SDKS += VB OX_OPENSSL-x863007 VBoxRT-x86_SDKS += VBoxOpenSslStatic-x86 3008 3008 3009 3009 VBoxRT-x86_LIBS = \ … … 3019 3019 VBoxRT-x86_LIBS += \ 3020 3020 $(SDK_VBOX_ZLIB_LIBS-x86) 3021 ifndef SDK_VB OX_OPENSSL_LIBS3021 ifndef SDK_VBoxOpenSslStatic_LIBS 3022 3022 VBoxRT-x86_LIBS += \ 3023 3023 $(PATH_STAGE_LIB)/VBox-libcrypto-x86$(VBOX_SUFF_LIB) \ … … 3404 3404 # 3405 3405 RuntimeR0Drv_TEMPLATE = VBoxR0DrvLib 3406 RuntimeR0Drv_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS) VB OX_OPENSSL3406 RuntimeR0Drv_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS) VBoxOpenSslStatic ## @todo why OpenSSL in ring-0 3407 3407 RuntimeR0Drv_DEFS = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID 3408 3408 RuntimeR0Drv_DEFS.win = IN_SUP_R0 LDR_ONLY_PE IPRT_WITHOUT_DIGEST_MD4 -
trunk/src/VBox/Runtime/testcase/Makefile.kmk
r98238 r98241 290 290 tstRTBigNum_TEMPLATE = VBoxR3TstExe 291 291 tstRTBigNum_SOURCES = tstRTBigNum.cpp 292 tstRTBigNum_SDKS = VB OX_OPENSSL2292 tstRTBigNum_SDKS = VBoxOpenSsl 293 293 tstRTBigNum_CXXFLAGS.win = -bigobj 294 294 -
trunk/src/VBox/Runtime/tools/Makefile.kmk
r98103 r98241 95 95 bldRTSignTool_DEFS += IPRT_SIGNTOOL_NO_SIGNING 96 96 else # RuntimeBldProg is missing a lot and is built w/o IPRT_WITH_OPENSSL. So, include missing and rebuilt openssl deps. 97 bldRTSignTool_SDKS += VB OX_OPENSSL_BLDPROG97 bldRTSignTool_SDKS += VBoxOpenSslBldProg 98 98 bldRTSignTool_DEFS += IPRT_WITH_OPENSSL 99 99 bldRTSignTool_SOURCES += \ -
trunk/src/libs/Makefile.kmk
r98240 r98241 99 99 && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \ 100 100 && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || defined(VBOX_WITH_BLD_RTSIGNTOOL_SIGNING) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \ 101 && ("$(SDK_VB OX_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)) 102 102 include $(PATH_SUB_CURRENT)/openssl-3.0.7/Makefile.kmk 103 103 endif -
trunk/src/libs/curl-7.83.1/Makefile.kmk
r98227 r98241 33 33 LIBRARIES += VBox-libcurl 34 34 VBox-libcurl_TEMPLATE = VBoxR3RuntimeDllNonPedantic 35 VBox-libcurl_SDKS = VBOX_ZLIB VB OX_OPENSSL35 VBox-libcurl_SDKS = VBOX_ZLIB VBoxOpenSslStatic 36 36 VBox-libcurl_DEFS = \ 37 37 CURL_STATICLIB \ -
trunk/src/libs/libtpms-0.9.0/Makefile.kmk
r98226 r98241 33 33 LIBRARIES += VBox-libtpms_tpm12 VBox-libtpms_tpm2 VBox-libtpms 34 34 VBox-libtpms_tpm12_TEMPLATE = VBoxR3DllNonPedantic 35 VBox-libtpms_tpm12_SDKS = VB OX_OPENSSL235 VBox-libtpms_tpm12_SDKS = VBoxOpenSsl 36 36 VBox-libtpms_tpm12_DEFS = \ 37 37 TPM_PCCLIENT \ … … 99 99 100 100 VBox-libtpms_tpm2_TEMPLATE = VBoxR3DllNonPedantic 101 VBox-libtpms_tpm2_SDKS = VB OX_OPENSSL2101 VBox-libtpms_tpm2_SDKS = VBoxOpenSsl 102 102 VBox-libtpms_tpm2_DEFS = \ 103 103 TPM_LIBTPMS_CALLBACKS -
trunk/src/libs/openssl-3.0.7/crypto/Makefile.kmk
r98229 r98241 46 46 if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) 47 47 $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS) crypto_sha) 48 else if "$(SDK_VB OX_OPENSSL_INCS)" != "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"48 else if "$(SDK_VBoxOpenSslStatic_INCS)" != "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" 49 49 $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS)) 50 50 endif … … 120 120 if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) 121 121 VBox-libcrypto_SOURCES += $(crypto_sha_1_TARGET) 122 else if "$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"122 else if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" 123 123 VBox-libcrypto_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $($(sublib)_1_TARGET)) 124 124 endif -
trunk/src/libs/openssl-3.0.7/providers/Makefile.kmk
r98229 r98241 46 46 # $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS) crypto_sha) 47 47 #else 48 if "$(SDK_VB OX_OPENSSL_INCS)" != "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"48 if "$(SDK_VBoxOpenSslStatic_INCS)" != "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" 49 49 $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS)) 50 50 endif … … 54 54 # The main target: libproviders. 55 55 # 56 if "$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"56 if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" 57 57 LIBRARIES += VBox-libproviders 58 58 endif -
trunk/src/libs/openssl-3.0.7/ssl/Makefile.kmk
r98229 r98241 32 32 # The main target: libssl. 33 33 # 34 if "$(SDK_VB OX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"34 if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" 35 35 LIBRARIES += VBox-libssl 36 36 endif
Note:
See TracChangeset
for help on using the changeset viewer.

