Changeset 76818 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Jan 14, 2019 4:17:07 PM (6 years ago)

Author:

vboxsync

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

128164

Message:

Config.kmk, HostDrivers/Support, Main, FE/Qt, Installer: bugref:9049: Wipe out VBOX_GUI_WITH_SHARED_LIBRARY, leaving split GUI build as the only possible.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (4 diffs)
• makepackage.sh (modified) (3 diffs)

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

@@ -294 +294 @@
 SOLARIS_STRIP_EXES = \
         VBoxZoneAccess \
-        $(if $(VBOX_WITH_QTGUI),VirtualBox $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VirtualBoxVM),) \
+        $(if $(VBOX_WITH_QTGUI),VirtualBox VirtualBoxVM,) \
         VBoxManage \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
@@ -373 +373 @@
         VBoxNetNAT.so \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
-        $(if $(VBOX_WITH_QTGUI),$(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VirtualBoxVM.so VBoxGlobal.so,VirtualBox.so),)
+        $(if $(VBOX_WITH_QTGUI),VirtualBoxVM.so VBoxGlobal.so,)
 endif
 
@@ -408 +408 @@
 # Naturally no subdirectories.
 SOLARIS_USRBIN_LINKS = \
-        $(if $(VBOX_WITH_QTGUI),VirtualBox $(if $(VBOX_GUI_WITH_SHARED_LIBRARY),VirtualBoxVM),) \
+        $(if $(VBOX_WITH_QTGUI),VirtualBox VirtualBoxVM,) \
         $(if $(VBOX_WITH_HEADLESS),VBoxHeadless,) \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
@@ -678 +678 @@
         $(REDIRECT) -C $(VBOX_PATH_SOL_INST_SRC) -- $(VBOX_PATH_SI_SCRATCH_PKG)/makepackage.sh \
                 $(if-expr defined(VBOX_WITH_HARDENING),--hardened,) \
-                $(if-expr defined(VBOX_GUI_WITH_SHARED_LIBRARY),--guisharedlib,) \
                 $(VBOX_PATH_SI_SCRATCH_PKG) \
                 $(PKG_FILENAME) \

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

@@ -24 +24 @@
 # Parse options.
 HARDENED=""
-GUISHAREDLIB=""
 while test $# -ge 1;
 do
@@ -30 +29 @@
         --hardened)
             HARDENED=1
-            ;;
-        --guisharedlib)
-            GUISHAREDLIB=1
             ;;
     *)
@@ -190 +186 @@
 if test -n "$HARDENED"; then
     $VBOX_AWK 'NF == 6 \
-        && (    (   $3 == "opt/VirtualBox/amd64/VirtualBox" \
-                 && "'$GUISHAREDLIB'" == "") \
-            ||  $3 == "opt/VirtualBox/amd64/VirtualBoxVM" \
+        && (    $3 == "opt/VirtualBox/amd64/VirtualBoxVM" \
             ||  $3 == "opt/VirtualBox/amd64/VBoxHeadless" \
             ||  $3 == "opt/VirtualBox/amd64/VBoxSDL" \