Changeset 61591 in vbox for trunk/src/libs

Timestamp:

Jun 8, 2016 8:07:23 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107933

Message:

Solaris: Ship libgcc_s.so.1 and libstdc++.so.6 (32-bit and 64-bit) for legacy systems which don't have there libraries. The binaries will find them in the package directory and need to have RPATH set accordingly.

Location:

trunk/src/libs/xpcom18a4

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -290 +290 @@
 TEMPLATE_XPCOM-x86_DEFS             = $(TEMPLATE_XPCOM_DEFS) VBOX_IN_32_ON_64_MAIN_API
 TEMPLATE_XPCOM-x86_LIBS             = $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),$(TEMPLATE_XPCOM_LIBS))
+ifeq ($(KBUILD_TARGET),solaris)
+ ifdef VBOX_WITH_RUNPATH
+  TEMPLATE_XPCOM-x86_LDFLAGS = \
+        $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)',$(TEMPLATE_XPCOM_LDFLAGS)) \
+        '$(VBOX_GCC_RPATH_OPT)$(VBOX_PATH_APP_PRIVATE)' \
+        '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
+ endif
+endif
 
 

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -1106 +1106 @@
 TEMPLATE_XPCOMIPC-x86_BLD_TRG_ARCH = x86
 TEMPLATE_XPCOMIPC-x86_LIBS         = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPCOM-x86_LIBS)
-
+ifeq ($(KBUILD_TARGET),solaris)
+ ifdef VBOX_WITH_RUNPATH
+  TEMPLATE_XPCOMIPC-x86_LDFLAGS = \
+        $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)',$(TEMPLATE_XPCOMIPC_LDFLAGS)) \
+        '$(VBOX_GCC_RPATH_OPT)$(VBOX_PATH_APP_PRIVATE)' \
+        '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
+ endif
+endif
 
 TEMPLATE_XPCOMIPCEXE               = XPCOM IPC executables