Changeset 60690 in vbox

Timestamp:

Apr 25, 2016 3:16:38 PM (8 years ago)

Author:

vboxsync

Message:

Solaris: Qt5 migration(part 113): Preparing Qt5 tool: Makefile changes.

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -5318 +5318 @@
  # Hack LD_LIBRARY_PATH for stuff in tools.
  ifdef VBOX_WITH_ORACLE_QT
-  if1of ($(KBUILD_TARGET), linux)
+  if1of ($(KBUILD_TARGET), linux solaris)
    export LD_LIBRARY_PATH := $(VBOX_PATH_QT_LIB):$(LD_LIBRARY_PATH)
   endif

trunk/Makefile.kmk

@@ -247 +247 @@
      qt5-bin_SOURCES = \
       $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.5.5.1=>lib$(qtmod).so.5) \
-      $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib)) \
-      $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(qt5-bin_0_OUTDIR)/$(lib)=>legacy/$(lib))
+      $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib))
+      ifneq ($(KBUILD_TARGET),solaris)
+       qt5-bin_SOURCES += \ 
+        $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(qt5-bin_0_OUTDIR)/$(lib)=>legacy/$(lib))
+      endif # solaris
 
 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.5.5.1): \
@@ -255 +258 @@
         $(QUIET)$(CP) $^ $@
         $(QUIET)chrpath --delete $@
-
+      
+      ifneq ($(KBUILD_TARGET),solaris)
 $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
@@ -262 +266 @@
         $(QUIET)$(CP) $^ $@
         $(QUIET)chrpath --delete $@
+      endif # !solaris
+
+     ## @todo For solaris dlopen fails to navigate executable rpath to dependent libraries, so add explicit rpath for libqxcb.so, find better solution later.
+      ifeq ($(KBUILD_TARGET),solaris)
+$(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
+        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
+        $(call MSG_INST_FILE,$^,$@)
+        $(QUIET)$(MKDIR) -p $(@D)
+        $(QUIET)$(CP) $^ $@
+        @echo "HERE!"
+        $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@
+      endif # solaris
 
 $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$$(qt5-bin_0_OUTDIR)/$(lib)): \