diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-04-07 13:42:48 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-04-07 13:42:48 +0000 |
| commit | 8703a1ade35620b2d4c15be95f65eac8d8016442 (patch) | |
| tree | ac7a304484c668aeb8f50047f1e3f7313d55a2cd /Makefile.kmk | |
| parent | cb44d8fac9a339b794060c0958f3231dae006930 (diff) | |
| download | VirtualBox-svn-8703a1ade35620b2d4c15be95f65eac8d8016442.tar.gz | |
Config.kmk, Makefile.kmk: bugref:9532: Excessive xcb legacy stuff which was necessary for Qt 5.6.x.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@88400 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'Makefile.kmk')
| -rw-r--r-- | Makefile.kmk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Makefile.kmk b/Makefile.kmk index db9d843242e..7faf67c8366 100644 --- a/Makefile.kmk +++ b/Makefile.kmk @@ -269,10 +269,6 @@ else # win x11 qt5-bin_SOURCES = \ $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*[0-9])=>lib$(qtmod).so.5) \ $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib)) - ifneq ($(KBUILD_TARGET),solaris) - qt5-bin_SOURCES += \ - $(foreach lib,$(VBOX_QT_LEGACY_LIBS),$(wildcard $(VBOX_PATH_QT_LIB)/legacy/$(lib).*.*)=>legacy/$(lib)) - endif # solaris else # !VBOX_WITH_HARDENING # For non-hardened builds we need to remove the RUNPATH. This stuff is # ugly but we need to prevent kBuild from hard-linking otherwise we @@ -285,10 +281,6 @@ else # win x11 qt5-bin_SOURCES = \ $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)=>lib$(qtmod).so.5) \ $(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.$(QT5_VERSION)): \ $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/ @@ -316,12 +308,6 @@ $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \ $(QUIET)chrpath --replace "\$$ORIGIN/../../" $@ endif # solaris linux -$(foreach lib,$(VBOX_QT_LEGACY_LIBS),$$(qt5-bin_0_OUTDIR)/$(lib)): \ - $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/legacy/% | $$(qt5-bin_0_OUTDIR)/ - $(call MSG_INST_FILE,$^,$@) - $(QUIET)$(CP) $^ $@ - $(QUIET)chrpath --delete $@ - endif # !VBOX_WITH_HARDENING endif # x11 endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD |