Changeset 99873 in vbox

Timestamp:

May 19, 2023 9:48:33 PM (23 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157514

Message:

/config.kmk: Some cleanups around VBOX_PATH_QT (untested). [fixes] bugref:10450

File:

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

trunk/Config.kmk

@@ -7666 +7666 @@
    endif
   else if1of ($(KBUILD_TARGET), win)
+   ## @todo kBuild: Use qfilter[-out] here once kmk.exe is updated.
    ifndef VBOX_WITH_QT6
     VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*))
-    VBOX_PATH_QT := $(firstfile $(qfilter ,%-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
-                $(qfilter-out ,%-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
+    VBOX_PATH_QT := $(firstfile $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
+                $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     ifdef VBOX_PATH_QT
      PATH_SDK_QT5  := $(VBOX_PATH_QT)
@@ -7676 +7677 @@
    else # qt6
     VBOX_PATH_QT := $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*))
-    VBOX_PATH_QT := $(firstfile $(qfilter ,%-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
-                $(qfilter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
+    VBOX_PATH_QT := $(firstfile $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(VBOX_PATH_QT)) \
+                $(filter-out %-vcc100 %-vcc110 %-vcc120 %-vcc140 %-vcc141 %-vcc142 %-vcc143 %-vcc150, $(VBOX_PATH_QT)))
     ifdef VBOX_PATH_QT
      PATH_SDK_QT6  := $(VBOX_PATH_QT)
@@ -7685 +7686 @@
   else if1of ($(KBUILD_TARGET), linux solaris)
    ifndef VBOX_WITH_QT6
-    VBOX_PATH_QT ?= $(firstfile $(qversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
-   else # qt6
-    VBOX_PATH_QT ?= $(firstfile $(qversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*)))
-   endif # qt6
+    VBOX_PATH_QT ?= $(firstfile $(versortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
+   else
+    VBOX_PATH_QT ?= $(firstfile $(versortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/qt/v6*)))
+   endif
    ifneq ($(VBOX_PATH_QT),)
     VBOX_WITH_ORACLE_QT = 1
@@ -7694 +7695 @@
   endif
  endif
- ifeq ($(VBOX_PATH_QT),)
-  if1of ($(USERNAME), bird)
-   # gentoo (64-bit)
-   VBOX_PATH_QT          ?= /usr
-   VBOX_PATH_QT_LIB      ?= /usr/lib/qt5
-  endif
- endif
- VBOX_PATH_QT            ?= /usr
- VBOX_PATH_QT_LIB        ?= $(VBOX_PATH_QT)/lib
+ VBOX_PATH_QT     ?= /usr
+ VBOX_PATH_QT_LIB ?= $(VBOX_PATH_QT)/lib
 
  if defined(VBOX_WITH_ORACLE_QT) && (!defined(VBOX_WITH_QT6) || "$(KBUILD_TARGET)" != "darwin")