Changeset 98241 in vbox for trunk/src/libs

Timestamp:

Jan 23, 2023 12:56:35 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155435

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/libs

Files:

• Makefile.kmk (modified) (1 diff)
• curl-7.83.1/Makefile.kmk (modified) (1 diff)
• libtpms-0.9.0/Makefile.kmk (modified) (2 diffs)
• openssl-3.0.7/crypto/Makefile.kmk (modified) (2 diffs)
• openssl-3.0.7/providers/Makefile.kmk (modified) (2 diffs)
• openssl-3.0.7/ssl/Makefile.kmk (modified) (1 diff)

trunk/src/libs/Makefile.kmk

@@ -99 +99 @@
  && (!defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_ADDITIONS_WITHOUT_RTISOMAKER)) \
  && (!defined(VBOX_ONLY_EXTPACKS) || defined(VBOX_NEED_EXTPACK_OPENSSL) || defined(VBOX_WITH_BLD_RTSIGNTOOL_SIGNING) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
- && ("$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))
+ && ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" || defined(VBOX_NEED_EXTPACK_OPENSSL))
   include $(PATH_SUB_CURRENT)/openssl-3.0.7/Makefile.kmk
 endif

trunk/src/libs/curl-7.83.1/Makefile.kmk

@@ -33 +33 @@
 LIBRARIES += VBox-libcurl
 VBox-libcurl_TEMPLATE       = VBoxR3RuntimeDllNonPedantic
-VBox-libcurl_SDKS           = VBOX_ZLIB VBOX_OPENSSL
+VBox-libcurl_SDKS           = VBOX_ZLIB VBoxOpenSslStatic
 VBox-libcurl_DEFS           = \
         CURL_STATICLIB \

trunk/src/libs/libtpms-0.9.0/Makefile.kmk

@@ -33 +33 @@
 LIBRARIES += VBox-libtpms_tpm12 VBox-libtpms_tpm2 VBox-libtpms
 VBox-libtpms_tpm12_TEMPLATE       = VBoxR3DllNonPedantic
-VBox-libtpms_tpm12_SDKS           = VBOX_OPENSSL2
+VBox-libtpms_tpm12_SDKS           = VBoxOpenSsl
 VBox-libtpms_tpm12_DEFS           = \
         TPM_PCCLIENT \
@@ -99 +99 @@
 
 VBox-libtpms_tpm2_TEMPLATE       = VBoxR3DllNonPedantic
-VBox-libtpms_tpm2_SDKS           = VBOX_OPENSSL2
+VBox-libtpms_tpm2_SDKS           = VBoxOpenSsl
 VBox-libtpms_tpm2_DEFS           = \
         TPM_LIBTPMS_CALLBACKS

trunk/src/libs/openssl-3.0.7/crypto/Makefile.kmk

@@ -46 +46 @@
 if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
  $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS) crypto_sha)
-else if "$(SDK_VBOX_OPENSSL_INCS)" != "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
+else if "$(SDK_VBoxOpenSslStatic_INCS)" != "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
  $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS))
 endif
@@ -120 +120 @@
 if defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
  VBox-libcrypto_SOURCES += $(crypto_sha_1_TARGET)
-else if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
+else if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
  VBox-libcrypto_SOURCES += $(foreach sublib,$(VBOX_CRYPTO_SUBLIBS), $($(sublib)_1_TARGET))
 endif

trunk/src/libs/openssl-3.0.7/providers/Makefile.kmk

@@ -46 +46 @@
 # $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS) crypto_sha)
 #else
-if "$(SDK_VBOX_OPENSSL_INCS)" != "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
+if "$(SDK_VBoxOpenSslStatic_INCS)" != "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
  $(eval LIBRARIES = $(VBOX_LIBRARIES_BEFORE_CRYPTO_SUBDIRS))
 endif
@@ -54 +54 @@
 # The main target: libproviders.
 #
-if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
+if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
  LIBRARIES += VBox-libproviders
 endif

trunk/src/libs/openssl-3.0.7/ssl/Makefile.kmk

@@ -32 +32 @@
 # The main target: libssl.
 #
-if "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
+if "$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)"
  LIBRARIES += VBox-libssl
 endif