Changeset 39043 in vbox

Timestamp:

Oct 19, 2011 5:04:08 PM (13 years ago)

Author:

vboxsync

Message:

Config.kmk, mangling, Runtime: use static zlib for Solaris.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Runtime/common/zip/gzipvfs.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -2444 +2444 @@
 
 SDK_VBOX_ZLIB         = .
-if1of ($(KBUILD_TARGET), os2 win)
+if1of ($(KBUILD_TARGET), os2 solaris win)
  SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.1
  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)

trunk/include/iprt/mangling.h

@@ -1682 +1682 @@
  * Stable variables (alphabetical order):
  */
+# define g_apfnRTZlibDeps                               RT_MANGLGER(g_apfnRTZlibDeps) /* os2 win solaris */
 # define g_aRTUniFlagsRanges                            RT_MANGLER(g_aRTUniFlagsRanges)
 # define g_aRTUniLowerRanges                            RT_MANGLER(g_aRTUniLowerRanges)
@@ -1709 +1710 @@
 /* none */
 
-
 #endif /* !DOXYGEN_RUNNING */
 

trunk/src/VBox/Runtime/common/zip/gzipvfs.cpp

@@ -41 +41 @@
 #include <zlib.h>
 
+#if defined(RT_OS_OS2) || defined(RT_OS_SOLARIS) || defined(RT_OS_WINDOWS)
+/**
+ * Drag in the missing zlib symbols.
+ */
+PFNRT g_apfnRTZlibDeps[] =
+{
+    (PFNRT)gzrewind,
+    (PFNRT)gzread,
+    (PFNRT)gzopen,
+    (PFNRT)gzwrite,
+    (PFNRT)gzclose,
+    (PFNRT)gzdopen,
+    NULL
+};
+#endif /* RT_OS_OS2 || RT_OS_SOLARIS || RT_OS_WINDOWS */
 
 /*******************************************************************************