Changeset 100938 in vbox

Timestamp:

Aug 22, 2023 1:14:20 PM (15 months ago)

Author:

vboxsync

Message:

openssl: switching to 3.1.0. bugref: 10418

Location:

trunk

Files:

trunk

Property svn:mergeinfo

old	new
11	11	/branches/VBox-6.0:130474-130475,130477,130479,131352
12	12	/branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071,158257-158259
13		/branches/VBox-7.0:156229,156768
	13	/branches/VBox-7.0:156229,156768,158309-158310
14	14	/branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095
15	15	/branches/andy/draganddrop:90781-91268

-              r100814
+              r100938
 # openssl
 SDK_VBoxOpenSslStatic                        := OpenSSL - Only for VBoxRT and/or statically linked programs.
 SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS      := $(PATH_OUT)/obj/crypto-3.0.7-headers/include
+SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS      := $(PATH_OUT)/obj/crypto-3.1.0-headers/include
 SDK_VBoxOpenSslStatic_INCS                   ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
 SDK_VBoxOpenSslStatic_ORDERDEPS              ?= $(crypto-headers_1_TARGET)
 …
 SDK_VBoxOpenSslStatic-x86                    := OpenSSL/x86 - Only for VBoxRT and/or statically linked programs.
 SDK_VBoxOpenSslStatic-x86_VBOX_DEFAULT_INCS  := $(PATH_OUT)/obj/crypto-3.0.7-headers/include
+SDK_VBoxOpenSslStatic-x86_VBOX_DEFAULT_INCS  := $(PATH_OUT)/obj/crypto-3.1.0-headers/include
 SDK_VBoxOpenSslStatic-x86_INCS               ?= $(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)
 SDK_VBoxOpenSslStatic-x86_ORDERDEPS          ?= $(crypto-headers_1_TARGET)

r100252	r100938
108	108	&& (!defined(VBOX_ONLY_EXTPACKS) \|\| defined(VBOX_NEED_EXTPACK_OPENSSL) \|\| defined(VBOX_WITH_BLD_RTSIGNTOOL_SIGNING) \|\| !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)) \
109	109	&& ("$(SDK_VBoxOpenSslStatic_INCS)" == "$(SDK_VBoxOpenSslStatic_VBOX_DEFAULT_INCS)" \|\| defined(VBOX_NEED_EXTPACK_OPENSSL))
110		include $(PATH_SUB_CURRENT)/openssl-3.~~0.7~~/Makefile.kmk
	110	include $(PATH_SUB_CURRENT)/openssl-3.1.0/Makefile.kmk
111	111	endif
112	112

Note: See TracChangeset for help on using the changeset viewer.