Changeset 2975 in kBuild

Timestamp:

Sep 27, 2016 2:14:15 PM (8 years ago)

Author:

bird

Message:

qt4.kmk,qt5.kmk: synced them

Location:

trunk/kBuild/units

Files:

• qt4.kmk (modified) (11 diffs)
• qt5.kmk (modified) (1 diff)

trunk/kBuild/units/qt4.kmk

@@ -104 +104 @@
     ifeq ($(PATH_SDK_QT4),)
      PATH_SDK_QT4 := $(patsubst %/bin/rcc,%,$(firstword $(wildcard \
-       /usr/lib/*/qt4/bin/rcc
+       /usr/lib/*/qt4/bin/rcc \
         /usr/bin/rcc \
         /usr/local/bin/rcc \
@@ -117 +117 @@
      ifeq ($(PATH_SDK_QT4_INC),)
       PATH_SDK_QT4_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/include/$(type)/qt4/QtCore/qglobal.h) \
         $(PATH_SDK_QT4)/include/QtCore/qglobal.h \
         $(PATH_SDK_QT4)/include/qt4/QtCore/qglobal.h \
@@ -134 +135 @@
         /usr/lib32/libQtCore$(SUFF_DLL) \
         /usr/lib32/qt4/libQtCore$(SUFF_DLL) \
-        /usr/lib/i386-linux-gnu/libQtCore$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).x86),/usr/lib/$(type)/libQtCore$(SUFF_DLL)) \
         /usr/local/lib32/libQtCore$(SUFF_DLL) \
         /usr/local/lib32/qt4/libQtCore$(SUFF_DLL) \
-        /usr/local/lib/i386-linux-gnu/libQtCore$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).x86),/usr/local/lib/$(type)/libQtCore$(SUFF_DLL)) \
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
@@ -154 +155 @@
         /usr/lib64/qt4/libQtCore$(SUFF_DLL) \
         /usr/lib/amd64/libQtCore$(SUFF_DLL) \
-        /usr/lib/x86_64-linux-gnu/libQtCore$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).amd64),/usr/lib/$(type)/libQtCore$(SUFF_DLL)) \
         /usr/local/lib64/libQtCore$(SUFF_DLL) \
         /usr/local/lib64/qt4/libQtCore$(SUFF_DLL) \
         /usr/local/lib/amd64/libQtCore$(SUFF_DLL) \
-        /usr/local/lib/x86_64-linux-gnu/libQtCore$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).amd64),/usr/local/lib/$(type)/libQtCore$(SUFF_DLL)) \
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
@@ -177 +178 @@
         /usr/lib/libQtCore$(SUFF_DLL) \
         /usr/lib/qt4/libQtCore$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/lib/$(type)/libQtCore$(SUFF_DLL)) \
         /usr/local/lib/libQtCore$(SUFF_DLL) \
         /usr/local/lib/qt4/libQtCore$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/local/lib/$(type)/libQtCore$(SUFF_DLL)) \
         )))
       endif
@@ -246 +249 @@
   ifneq ($(TOOL_QT4_BIN_SUFF),)
    PATH_TOOL_QT4_BIN := $(patsubst %/moc$(TOOL_QT4_BIN_SUFF),%,$(firstword $(wildcard \
+         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/moc$(TOOL_QT4_BIN_SUFF)) \
          /usr/lib/qt4/bin/moc$(TOOL_QT4_BIN_SUFF) \
          /usr/qt/4/bin/moc$(TOOL_QT4_BIN_SUFF) \
@@ -254 +258 @@
   else
    PATH_TOOL_QT4_BIN := $(patsubst %/moc-qt4,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/moc-qt4) \
         /usr/lib/qt4/bin/moc-qt4 \
         /usr/qt/4/bin/moc-qt4 \
@@ -265 +270 @@
     # If no luck, try looking for moc in the qt4 specific locations.
     PATH_TOOL_QT4_BIN := $(patsubst %/moc,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/moc) \
         /usr/lib/qt4/bin/moc \
         /usr/qt/4/bin/moc \
@@ -274 +280 @@
   ifeq ($(PATH_TOOL_QT4_BIN),)
    PATH_TOOL_QT4_BIN := $(patsubst %/qt3to4,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/qt3to4) \
         /usr/lib/qt4/bin/qt3to4 \
         /usr/qt/4/bin/qt3to4 \
@@ -283 +290 @@
   ifeq ($(PATH_TOOL_QT4_BIN),)
    PATH_TOOL_QT4_BIN := $(patsubst %/rcc$(TOOL_QT4_BIN_SUFF),%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/rcc$(TOOL_QT4_BIN_SUFF)) \
         /usr/lib/qt4/bin/rcc$(TOOL_QT4_BIN_SUFF) \
         /usr/qt/4/bin/rcc$(TOOL_QT4_BIN_SUFF) \
@@ -292 +300 @@
   if "$(PATH_TOOL_QT4_BIN)" == "" && "$(TOOL_QT4_BIN_SUFF)" != ""
    PATH_TOOL_QT4_BIN := $(patsubst %/rcc,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_HOST_DOT_ARCH)),/usr/lib/$(type)/qt4/bin/rcc) \
         /usr/lib/qt4/bin/rcc \
         /usr/qt/4/bin/rcc \

trunk/kBuild/units/qt5.kmk

@@ -104 +104 @@
     ifeq ($(PATH_SDK_QT5),)
      PATH_SDK_QT5 := $(patsubst %/bin/rcc,%,$(firstword $(wildcard \
+       /usr/lib/*/qt5/bin/rcc \
         /usr/bin/rcc \
         /usr/local/bin/rcc \