VirtualBox

Changeset 67126 in vbox for trunk


Ignore:
Timestamp:
May 29, 2017 7:24:33 AM (7 years ago)
Author:
vboxsync
Message:

Makefile.kmk: fixed regression from r115727

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.kmk

    r67125 r67126  
    222222
    223223$(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)): \
    224        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
    225        $(call MSG_INST_FILE,$^,$@)
    226        $(QUIET)$(CP) $^ $@
    227        $(QUIET)chrpath --delete $@
     224        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
     225        $(call MSG_INST_FILE,$^,$@)
     226        $(QUIET)$(CP) $^ $@
     227        $(QUIET)chrpath --delete $@
    228228
    229229     ifneq ($(KBUILD_TARGET),solaris)
    230230$(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    231        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
    232        $(call MSG_INST_FILE,$^,$@)
    233        $(QUIET)$(MKDIR) -p $(@D)
    234        $(QUIET)$(CP) $^ $@
    235        $(QUIET)chrpath --delete $@
     231        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
     232        $(call MSG_INST_FILE,$^,$@)
     233        $(QUIET)$(MKDIR) -p $(@D)
     234        $(QUIET)$(CP) $^ $@
     235        $(QUIET)chrpath --delete $@
    236236     endif # !solaris
    237237
     
    240240     ifeq ($(KBUILD_TARGET),solaris)
    241241$(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    242        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
    243        $(call MSG_INST_FILE,$^,$@)
    244        $(QUIET)$(MKDIR) -p $(@D)
    245        $(QUIET)$(CP) $^ $@
    246        $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@
     242        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
     243        $(call MSG_INST_FILE,$^,$@)
     244        $(QUIET)$(MKDIR) -p $(@D)
     245        $(QUIET)$(CP) $^ $@
     246        $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@
    247247     endif # solaris
    248248
    249249$(foreach lib,$(VBOX_QT_LEGACY_LIBS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    250        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/legacy/% | $$(qt5-bin_0_OUTDIR)/
    251        $(call MSG_INST_FILE,$^,$@)
    252        $(QUIET)$(CP) $^ $@
    253        $(QUIET)chrpath --delete $@
     250        $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/legacy/% | $$(qt5-bin_0_OUTDIR)/
     251        $(call MSG_INST_FILE,$^,$@)
     252        $(QUIET)$(CP) $^ $@
     253        $(QUIET)chrpath --delete $@
    254254
    255255   endif # !VBOX_WITH_HARDENING
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette