Changeset 11551 in vbox for trunk/src/libs/xpcom18a4/Makefile.kmk

Timestamp:

Aug 21, 2008 5:16:02 PM (17 years ago)

Author:

vboxsync

Message:

API/xpcom: prefix any C symbols in VBoxXPCOM.so, to avoid namespace pollution. Enabled only on Linux at the moment.

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -27 +27 @@
 endif
 include $(KBUILD_PATH)/subheader.kmk
+
+# File for filtering out C symbols from the XPCOM library. Used to avoid
+# symbol namespace pollution, causing trouble with system libraries.
+XPCOM_C_NAMESPACE_MAP=$(VBOX_PATH_XPCOM_SRC)/xpcom-namespace-cleanup.map
+
+# @todo check whether VBoxXPCOMIPCC.so or VBoxXPCOMIPCD contain undefined
+# symbols starting with NS_, PL_, PR_ or XPT. Would move the test time failure
+# when missing a symbol renaming to a build time failure. Likewise, there
+# should be a check whether VBoxXPCOM.so contains global C symbols (at least
+# where the whitelisting of symbols via the map file is not used).
+
 
 ifdef VBOX_WITH_PYTHON
@@ -78 +89 @@
                                      XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \
                                      MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\"
+ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+TEMPLATE_XPCOM_DEFS                               += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+endif
 TEMPLATE_XPCOM_DEFS.x86            = i386=1
 TEMPLATE_XPCOM_DEFS.amd64          = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\)
@@ -1099 +1113 @@
 VBoxXPCOM_NAME = $(basename $(notdir $(LIB_XPCOM)))
 VBoxXPCOM_DEFS = BUILD_DCONNECT="1" _IMPL_NS_COM
+ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+VBoxXPCOM_LDFLAGS.linux     = -Wl,--version-script=$(XPCOM_C_NAMESPACE_MAP)
+VBoxXPCOM_DEPS.linux       += $(XPCOM_C_NAMESPACE_MAP)
+VBoxXPCOM_LDFLAGS.solaris   = -Wl,-M,$(XPCOM_C_NAMESPACE_MAP)
+VBoxXPCOM_DEPS.solaris     += $(XPCOM_C_NAMESPACE_MAP)
+endif
 VBoxXPCOM_SOURCES = \
         xpcom/build/nsXPComInit.cpp \