Changeset 61591 in vbox for trunk/src/VBox

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/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (5 diffs)
• vboxconfig.sh (modified) (3 diffs)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -251 +251 @@
 SOLARIS_COMMON = \
         LICENSE
+
 ## @def SOLARIS_COMMON_EXES
 # List of executable script (and VBoxISAExec) files that are copied directly from INST_BIN to /opt/VirtualBox/.
@@ -266 +267 @@
 SOLARIS_FILE_LIST_VARS += SOLARIS_COMMON_STRIP_BINS
 SOLARIS_COMMON_STRIP_BINS.SUBDIRS := yes
-SOLARIS_COMMON_STRIP_BINS.STRIP   := no
+SOLARIS_COMMON_STRIP_BINS.STRIP   := yes
 SOLARIS_COMMON_STRIP_BINS.MODE    := 0644
 SOLARIS_COMMON_STRIP_BINS.SRC     := $(PATH_STAGE_BIN)
@@ -567 +568 @@
                 $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL),$(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2,) \
                 \
+                $(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6, $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib))) \
+                \
                 $(foreach var, $(SOLARIS_FILE_LIST_VARS),$(foreach file, $($(var)), $($(var).SRC)/$(file))) \
                 \
@@ -583 +586 @@
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/ \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ \
+                $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/legacy \
+                $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/ \
+                $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/legacy/ \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/platform/ \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/ \
@@ -637 +643 @@
 
         $(if-expr !defined(VBOX_OSE) && defined(VBOX_WITH_VBOXSDL) \
-        ,$(INSTALL) -m 0644 $(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2 \
+        ,$(INSTALL) -s -m 0644 $(PATH_DEVTOOLS_TRG)/libsdl/v1.2.13/lib/libSDL-1.2.so.0.11.2 \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/libSDL-1.2.so.0,)
+
+        $(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6 \
+                ,$(NLTAB)$(INSTALL) -s -m 0644 $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib) \
+                $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(if-expr $(arch) == "amd64",amd64/,)legacy/$(lib)))
 
         $(if-expr defined(VBOX_WITH_EFIFW_PACKING) \

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -1151 +1151 @@
     stop_process "VBoxNetNAT"
 
-   # Stop VBoxSVC quickly using SIGUSR1
+    # Stop VBoxSVC quickly using SIGUSR1
     procname="VBoxSVC"
     procpid=`ps -eo pid,fname | grep $procname | grep -v grep | awk '{ print $1 }'`
@@ -1182 +1182 @@
         fi
     fi
+
+    # remove the S10 legacy library links
+    for l in `find /opt/VirtualBox -name "lib*" -type l`; do rm $l; done
 }
 
@@ -1248 +1251 @@
                 subprint "Skipped for targetted installs."
             fi
+        fi
+
+        # Install the S10 legacy library links if necessary
+        if ldd /opt/VirtualBox/amd64/VBoxRT-x86.so | grep "not found" > /dev/null; then
+            for lib in `ls -1 /opt/VirtualBox/legacy/`; do
+                ln -sf legacy/$lib /opt/VirtualBox/$lib
+            done
+        fi
+        if ldd /opt/VirtualBox/amd64/VBoxRT.so | grep "not found" > /dev/null; then
+            for lib in `ls -1 /opt/VirtualBox/amd64/legacy/`; do
+                ln -sf legacy/$lib /opt/VirtualBox/amd64/$lib
+            done
         fi