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

2 files changed, 0 insertions, 23 deletions

diff --git a/Config.kmk b/Config.kmk
index 92ac8c4b423..6fd23cfc70b 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3104,9 +3104,6 @@ endif
 	$(QUIET)$(APPEND) '$@' 'VBOX_YASM_Wno-segreg-in-64bit  ?= $(call VBOX_YASM_CHECK,-Wno-segreg-in-64bit,)'
 # NASM (--allow-64-bit: 2.12rc2)
 	$(QUIET)$(APPEND) '$@' 'VBOX_NASM_allow_64_bit         ?= $(call VBOX_NASM_CHECK,--allow-64-bit,)'
-ifeq ($(KBUILD_HOST),linux)
-	$(QUIET)$(APPEND) '$@' 'VBOX_LD_HAS_LIBXCB             ?= $(shell /sbin/ldconfig -p|grep -q "\<libxcb\.so\.1\>" && echo "1")'
-endif
 if1of ($(KBUILD_TARGET), linux)
  ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
 	$(QUIET)$(RM) -f -- "$@.sanitizer.so" "$@.sanitizer32.so" '$@.sanitizer.c'
@@ -6994,8 +6991,6 @@ ifdef VBOX_WITH_QTGUI
   VBOX_QT_MOD += Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport $(if $(VBOX_GUI_USE_QGL),Qt5OpenGL,)
   if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
    VBOX_QT_MOD += Qt5DBus Qt5XcbQpa Qt5X11Extras
-   # legacy libraries required to be installed on EL5
-   VBOX_QT_LEGACY_LIBS = $(if $(VBOX_LD_HAS_LIBXCB),,libxcb.so.1 libX11.so.6 libX11-xcb.so.1)
    VBOX_QT_PLUGINS = \
    	plugins/platforms/libqxcb.so \
    	plugins/sqldrivers/libqsqlite.so \
@@ -7165,10 +7160,6 @@ ifdef VBOX_WITH_QTGUI
 	X11
     TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
 	$(VBOX_LIBPATH_X11)
-   if defined(VBOX_WITH_ORACLE_QT) && !defined(VBOX_LD_HAS_LIBXCB)
-    TEMPLATE_VBOXQTGUIEXE_LIBPATH += $(PATH_SDK_QT5_LIB)/legacy
-    TEMPLATE_VBOXQTGUIEXE_INCS    += $(PATH_SDK_QT5_INC)/legacy
-   endif
   else ifeq ($(KBUILD_TARGET),darwin)
    TEMPLATE_VBOXQTGUIEXE_SDKS.darwin        += $(VBOX_DARWIN_DEF_SDK_SDKS)
    TEMPLATE_VBOXQTGUIEXE_DEFS.darwin        += $(VBOX_DARWIN_DEF_SDK_DEFS)
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