Changeset 69134 in vbox

Timestamp:

Oct 19, 2017 1:46:12 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9024: Set RUNPATH (or RPATH depending on the system) of libqxcb.so explicity instead of removing it

File:

• trunk/Makefile.kmk (modified) (3 diffs)

trunk/Makefile.kmk

@@ -230 +230 @@
         $(QUIET)chrpath --delete $@
 
-     ifneq ($(KBUILD_TARGET),solaris)
+     ifn1of ($(KBUILD_TARGET),solaris linux)
 $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
@@ -237 +237 @@
         $(QUIET)$(CP) $^ $@
         $(QUIET)chrpath --delete $@
-     endif # !solaris
-
-     # @todo For solaris dlopen fails to navigate executable rpath to dependent libraries,
+     endif # !solaris and !linux
+
+     # @todo For solaris and some linuxes dlopen fails to navigate executable rpath to dependent libraries,
      #       so add explicit rpath for libqxcb.so, find better solution later.
-     ifeq ($(KBUILD_TARGET),solaris)
+     if1of ($(KBUILD_TARGET),solaris linux)
 $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
@@ -248 +248 @@
         $(QUIET)$(CP) $^ $@
         $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@
-     endif # solaris
+     endif # solaris linux
 
 $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$$(qt5-bin_0_OUTDIR)/$(lib)): \