Changeset 106331 in vbox for trunk/Makefile.kmk

Timestamp:

Oct 15, 2024 8:15:09 PM (6 weeks ago)

Author:

vboxsync

Message:

Makefile.kmk: bugref:10450: Allow building VBox with side-load Qt6 binaries even without branding postfix and even of different version than ours; This requires a bunch of flags to be overridden, such as VBOX_WITH_QT_PAYLOAD, PATH_SDK_QT6 and PATH_TOOL_QT6.

File:

• trunk/Makefile.kmk (modified) (4 diffs)

trunk/Makefile.kmk

@@ -291 +291 @@
         $(call VBOX_RE_SIGN_DLL_FN,qt-bin,$(PATH_SDK_QT6)/plugins/styles/qwindowsvistastyle$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL))=>styles/qwindowsvistastyle$(VBOX_QT_POSTFIX)$(VBOX_QT_DBG)$(SUFF_DLL)
    ifdef VBOX_WITH_QT_PDBS
-    qt-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT6)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
+    qt-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT6)/qt*/$(PATH_SDK_QT6_LIB)/$(qtmod).pdb))
    endif
 
   else # x11
-   VBOX_QT_VERSION       := 6.5.3
    VBOX_QT_VERSION_MAJOR := 6
    ifdef VBOX_WITH_HARDENING
     # The wildcards are necessary to install the libs instead of the symlinks
     qt-bin_SOURCES = \
-        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*[0-9])=>lib$(qtmod).so.$(VBOX_QT_VERSION_MAJOR)) \
-        $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib))
+        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT6_LIB)/lib$(qtmod).so.*.*.*[0-9])=>lib$(qtmod).so.$(VBOX_QT_VERSION_MAJOR)) \
+        $(foreach lib,$(VBOX_QT_PLUGINS),$(PATH_SDK_QT6)/$(lib)=>$(lib))
    else # !VBOX_WITH_HARDENING
     # For non-hardened builds we need to remove the RUNPATH. This stuff is
@@ -307 +306 @@
     # (indirectly) change the binaries in tools
     qt-bin_SOURCES = \
-        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt-bin_0_OUTDIR)/lib$(qtmod).so.$(VBOX_QT_VERSION)=>lib$(qtmod).so.$(VBOX_QT_VERSION_MAJOR)) \
+        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt-bin_0_OUTDIR)/lib$(qtmod).so.$(VBOX_QT_VERSION_MAJOR)=>lib$(qtmod).so.$(VBOX_QT_VERSION_MAJOR)) \
         $(foreach lib,$(VBOX_QT_PLUGINS),$(qt-bin_0_OUTDIR)/$(lib)=>$(lib))
 
-    $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt-bin_0_OUTDIR)/lib$(qtmod).so.$(VBOX_QT_VERSION)): \
-                $$(qt-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt-bin_0_OUTDIR)/
+    $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt-bin_0_OUTDIR)/lib$(qtmod).so.$(VBOX_QT_VERSION_MAJOR)): \
+                $$(qt-bin_0_OUTDIR)/% : $(PATH_SDK_QT6_LIB)/% | $$(qt-bin_0_OUTDIR)/
         $(call MSG_INST_FILE,$^,$@)
         $(QUIET)$(CP) $^ $@
@@ -318 +317 @@
     ifn1of ($(KBUILD_TARGET), solaris linux)
      $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt-bin_0_OUTDIR)/$(lib)): $$(qt-bin_0_OUTDIR)/% : \
-                $(VBOX_PATH_QT)/% | $$(qt-bin_0_OUTDIR)/
+                $(PATH_SDK_QT6)/% | $$(qt-bin_0_OUTDIR)/
         $(call MSG_INST_FILE,$^,$@)
         $(QUIET)$(MKDIR) -p $(@D)
@@ -329 +328 @@
     if1of ($(KBUILD_TARGET), solaris linux)
      $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt-bin_0_OUTDIR)/$(lib)): $$(qt-bin_0_OUTDIR)/% : \
-                $(VBOX_PATH_QT)/% | $$(qt-bin_0_OUTDIR)/
+                $(PATH_SDK_QT6)/% | $$(qt-bin_0_OUTDIR)/
         $(call MSG_INST_FILE,$^,$@)
         $(QUIET)$(MKDIR) -p $(@D)