Changeset 60081 in vbox for trunk

Timestamp:

Mar 17, 2016 4:58:03 PM (9 years ago)

Author:

vboxsync

Message:

Qt5: properly change RPATH=$ORIGIN for non-hardened builds

File:

• trunk/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -236 +236 @@
     qt5-bin_INST = $(INST_BIN)
     qt5-bin_SOURCES = \
-     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod)$(SUFF_DLL).*.*.*)=>lib$(qtmod)$(SUFF_DLL).5) \
-     $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL)
+     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod)$(SUFF_DLL).5.5.1=>lib$(qtmod)$(SUFF_DLL).5) \
+     $(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL)=>platforms/libqxcb$(SUFF_DLL)
+
+$(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod)$(SUFF_DLL).5.5.1): \
+        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)
+        $(call MSG_INST_FILE,$^,$@)
+        $(QUIET)$(CP) $^ $@
+        $(if $(VBOX_WITH_HARDENING),,chrpath --replace "\$$ORIGIN" $@)
+    
+$$(qt5-bin_0_OUTDIR)/libqxcb$(SUFF_DLL): $(VBOX_PATH_QT)/plugins/platforms/libqxcb$(SUFF_DLL)
+        $(call MSG_INST_FILE,$^,$@)
+        $(QUIET)$(CP) $^ $@
+        $(if $(VBOX_WITH_HARDENING),,chrpath --replace "\$$ORIGIN" $@)
+
+$$(qt5-bin_0_OUTDIR):
+        $(MKDIR) -p $@
+
    endif # x11
   endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD