Changeset 59613 in vbox for trunk

Timestamp:

Feb 9, 2016 12:14:36 PM (9 years ago)

Author:

vboxsync

Message:

openssl 1.0.1r: VBox adaptions (taken from 1.0.1q), adapted path in Config.kmk and executed 'recreate-openssl-asm'

Location:

trunk

Files:

• src/libs/Makefile.kmk (modified) (1 diff)
• tools/bin/gen-slickedit-workspace.sh (modified) (1 diff)

trunk/src/libs/Makefile.kmk

@@ -53 +53 @@
  && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
      || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
- include $(PATH_SUB_CURRENT)/openssl-1.0.1q/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/openssl-1.0.1r/Makefile.kmk
 endif
 

trunk/tools/bin/gen-slickedit-workspace.sh

@@ -985 +985 @@
 my_generate_project "liblzf"        "src/libs/liblzf-3.4"                   --begin-incs "include"                                          --end-includes "src/libs/liblzf-3.4"
 my_generate_project "libpng"        "src/libs/libpng-1.2.54"                --begin-incs "include"                                          --end-includes "src/libs/libpng-1.2.54/*.c" "src/libs/libpng-1.2.54/*.h"
-my_generate_project "openssl"       "src/libs/openssl-1.0.1q"               --begin-incs "include" "src/libs/openssl-1.0.1q/crypto"         --end-includes "src/libs/openssl-1.0.1q"
+my_generate_project "openssl"       "src/libs/openssl-1.0.1r"               --begin-incs "include" "src/libs/openssl-1.0.1r/crypto"         --end-includes "src/libs/openssl-1.0.1r"
 my_generate_project "curl"          "src/libs/curl-7.47.0"                  --begin-incs "include" "src/libs/curl-7.47.0/include"           --end-includes "src/libs/curl-7.47.0"
 my_generate_project "kStuff"        "src/libs/kStuff"                       --begin-incs "include" "src/libs/kStuff/kStuff/include"         --end-includes "src/libs/kStuff"