Changeset 20987 in vbox

Timestamp:

Jun 26, 2009 3:52:38 PM (15 years ago)

Author:

vboxsync

Message:

Config.kmk,src/libs/Makefile.kmk: the VBOX_OPENSSL SDK needs an ORDERDEPS on the crypto-headers. Fixed namespace violation.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -1851 +1851 @@
 
 SDK_VBOX_OPENSSL      = .
-SDK_VBOX_OPENSSL_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
-SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_DEFAULT_INCS)
+SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
+SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
+SDK_VBOX_OPENSSL_ORDERDEPS ?= $(crypto-headers_1_TARGET)
 ifndef VBOX_WITH_LIBXML2_IN_VBOXRT
  SDK_VBOX_OPENSSL_LIBS ?= $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)

trunk/src/libs/Makefile.kmk

@@ -59 +59 @@
 # OpenSSL for VRDP.
 if defined(VBOX_WITH_VRDP) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_SDK) \
- && "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_DEFAULT_INCS)"
+ && "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
  include $(PATH_SUB_CURRENT)/openssl-0.9.8k/Makefile.kmk
 endif