Changeset 88400 in vbox for trunk

Timestamp:

Apr 7, 2021 1:42:48 PM (4 years ago)

Author:

vboxsync

Message:

Config.kmk, Makefile.kmk: bugref:9532: Excessive xcb legacy stuff which was necessary for Qt 5.6.x.

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -3105 +3105 @@
 # 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))
@@ -6995 +6992 @@
   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 \
@@ -7166 +7161 @@
     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)

trunk/Makefile.kmk

@@ -270 +270 @@
      $(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
@@ -286 +282 @@
      $(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)): \
@@ -316 +308 @@
         $(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