Changeset 74653 in vbox

Timestamp:

Oct 7, 2018 12:49:57 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: Try shut up xmlFree linker warning.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (3 diffs)
• configure.vbs (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/libs/libxml2-2.9.4/Makefile.kmk (modified) (1 diff)
• src/libs/libxml2-2.9.4/libxml.h (modified) (1 diff)

trunk/Config.kmk

@@ -3947 +3947 @@
 # SDKs for external libraries.
 #
-SDK_VBOX_LIBXML2          = .
-SDK_VBOX_LIBXML2_INCS   ?= $(PATH_ROOT)/src/libs/libxml2-2.9.4/include
-SDK_VBOX_LIBXML2_DEFS  ?= _REENTRANT
-SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
-# note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
-# libxml against VBoxRT
+SDK_VBOX_LIBXML2           = .
+SDK_VBOX_LIBXML2_INCS     ?= $(PATH_ROOT)/src/libs/libxml2-2.9.4/include
+SDK_VBOX_LIBXML2_DEFS     ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
+SDK_VBOX_LIBXML2_DEFS.win ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
+# Note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
+#       libxml against VBoxRT
 
 SDK_VBOX_LIBPNG       = .

trunk/configure

@@ -659 +659 @@
 
 #
-# Check for libxml2, needed by VBoxSettings and Runtime.
+# Check for libxml2, needed by the Runtime.
 # 2.6.24 is known to NOT work, 2.6.26 is known to work (there is no 2.6.25 release)
 #
@@ -693 +693 @@
         if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
           if test_execute; then
+            cnf_append "SDK_VBOX_LIBXML2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
             cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
             cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
@@ -726 +727 @@
         if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
           if test_execute; then
+            cnf_append "SDK_VBOX_LIBXML2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
             cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
             cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"

trunk/configure.vbs

@@ -1821 +1821 @@
 
    strPathXml2 = UnixSlashes(PathAbs(strPathXml2))
+   CfgPrint "SDK_VBOX_LIBXML2_DEFS  := _REENTRANT"
    CfgPrint "SDK_VBOX_LIBXML2_INCS  := " & strPathXml2 & "/include"
    CfgPrint "SDK_VBOX_LIBXML2_LIBS  := " & strPathXml2 & "/lib/libxml2.lib"

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2169 +2169 @@
         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
 VBoxRT_LDFLAGS.win             = /MANIFEST \
-        /delayload:gdi32.dll \
         /delayload:user32.dll \
         /delayload:shell32.dll \

trunk/src/libs/libxml2-2.9.4/Makefile.kmk

@@ -26 +26 @@
 VBox-libxml2_DEFS           = _REENTRANT # the latter triggers thread support, see xmlversion-default.h and win32xmlversion.h.
 VBox-libxml2_DEFS.win       = WIN32 _WINDOWS _MBCS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE \
-                              LIBXML_STATIC_FOR_DLL HAVE_WIN32_THREADS HAVE_ZLIB_H
+                              LIBXML_STATIC LIBXML_STATIC_FOR_DLL HAVE_WIN32_THREADS HAVE_COMPILER_TLS HAVE_ZLIB_H
 VBox-libxml2_CFLAGS.win.amd64 = -wd4267
 VBox-libxml2_CFLAGS.win    += -wd4701 # potentially uninitialized local variable 'l' used

trunk/src/libs/libxml2-2.9.4/libxml.h

@@ -116 +116 @@
 #endif
 #endif
-#if !defined(PIC) && !defined(NOLIBTOOL)
+#if !defined(PIC) && !defined(NOLIBTOOL) /* VBox: */ && !defined(LIBXML_STATIC)
 #  define LIBXML_STATIC
 #endif