Changeset 64148 in vbox

Timestamp:

Oct 5, 2016 7:47:35 AM (8 years ago)

Author:

vboxsync

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

111123

Message:

drop openssl 1.0.1, replaced VBOX_WITH_OPENSSL_1_1_0 with VBOX_WITH_OPENSSL_PRE_1_1

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -748 +748 @@
 ## @name Misc
 ## @{
-VBOX_WITH_OPENSSL_1_1_0 = 1
+# Enable to compile with OpenSSL 1.0 (only relevant for Windows, see src/VBox/Runtime/Makefile.kmk)
+#VBOX_WITH_OPENSSL_PRE_1_1 = 1
 # Enable Seamless mode
 VBOX_X11_SEAMLESS_GUEST = 1

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1599 +1599 @@
 $$(VBoxRT_0_OUTDIR)/VBoxRT.def: \
                 $(PATH_SUB_CURRENT)/r3/win/VBoxRT-$$(if-expr $$(KBUILD_TARGET_ARCH) == amd64,win64,win32).def \
-                $(if-expr defined(VBOX_WITH_OPENSSL_1_1_0)\
-                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-1.1plus.def \
-                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-pre-1.1.def )\
+                $(if-expr defined(VBOX_WITH_OPENSSL_PRE_1_1)\
+                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-pre-1.1.def \
+                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-1.1plus.def )\
                 $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" && defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES)\
                 ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcr100-win32.def ,) #$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcp100-win32.def

trunk/src/libs/Makefile.kmk

@@ -53 +53 @@
  && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
      || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
- ifdef VBOX_WITH_OPENSSL_1_1_0
-  include $(PATH_SUB_CURRENT)/openssl-1.1.0b/Makefile.kmk
- else
-  include $(PATH_SUB_CURRENT)/openssl-1.0.1t/Makefile.kmk
- endif
+ include $(PATH_SUB_CURRENT)/openssl-1.1.0b/Makefile.kmk
 endif