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

Timestamp:

Apr 7, 2021 10:09:21 AM (4 years ago)

Author:

vboxsync

Message:

Installer/solaris: bugref:9532: Excessive xcb/gcc/stdc legacy stuff which was necessary for Qt 5.6.x.

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (2 diffs)

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

@@ -581 +581 @@
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/ \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/ \
-                $(if $(VBOX_OSE),,$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/legacy/) \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/ \
-                $(if $(VBOX_OSE),,$(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/amd64/legacy/) \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/platform/ \
                 $(VBOX_PATH_SI_SCRATCH_PKG)/platform/i86pc/ \
@@ -640 +638 @@
         ,$(INSTALL) -s -m 0644 $(KBUILD_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,)
-
-        $(if $(VBOX_OSE),,$(foreach arch, x86 amd64, $(foreach lib, libgcc_s.so.1 libstdc++.so.6 \
-                ,$(NLTAB)$(INSTALL) -s -m 0644 $(PATH_S10LIBS.$(arch))/$(lib) \
-                $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(if-expr $(arch) == "amd64",amd64/,)legacy/$(lib))))
-
-        $(if $(VBOX_OSE),,$(foreach arch, amd64, $(foreach lib, libxcb.so.1 libX11-xcb.so.1 libX11.so.4 libGL.so \
-                ,$(NLTAB)$(INSTALL) -s -m 0644 $(PATH_S10LIBS.$(arch))/$(lib) \
-                $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(if-expr $(arch) == "amd64",amd64/,)legacy/$(lib))))
 
         $(if-expr defined(VBOX_WITH_EFIFW_PACKING) \