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

Timestamp:

Jun 24, 2016 8:37:03 AM (9 years ago)

Author:

vboxsync

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

108291

Message:

Installer/solaris: Packaging missing X11, xcb and libGL legacy libraries for s10.

File:

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

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

@@ -571 +571 @@
                         $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib)))) \
                 \
+                $(if $(VBOX_OSE),,$(foreach arch, amd64, $(foreach lib, libxcb.so.1 libX11-xcb.so.1 libX11.so.4 libGL.so, \
+                        $(PATH_DEVTOOLS)/solaris.$(arch)/s10libs/$(lib)))) \
+                \
                 $(foreach var, $(SOLARIS_FILE_LIST_VARS),$(foreach file, $($(var)), $($(var).SRC)/$(file))) \
                 \
@@ -651 +654 @@
                 $(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_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) \
         ,$(LN_SYMLINK) ../VBoxEFI32.fd ../VBoxEFI64.fd  $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,)