Changeset 2544 in kBuild

Timestamp:

Sep 13, 2011 7:00:25 PM (13 years ago)

Author:

bird

Message:

qt4.kmk,qt3.kmk: Probe for qt libs in the right places on multi-arch ubuntu.

Location:

trunk/kBuild/units

Files:

• qt3.kmk (modified) (3 diffs)
• qt4.kmk (modified) (2 diffs)

trunk/kBuild/units/qt3.kmk

@@ -120 +120 @@
         /usr/lib32/libqt-mt$(SUFF_DLL) \
         /usr/lib32/qt3/libqt-mt$(SUFF_DLL) \
-        /usr/lib32/qt3-3/lib/libqt-mt$(SUFF_DLL) \
+        /usr/lib/i386-linux-gnu/libqt-mt$(SUFF_DLL) \
         /usr/local/lib32/libqt-mt$(SUFF_DLL) \
         /usr/local/lib32/qt3/libqt-mt$(SUFF_DLL) \
         /usr/local/lib32/qt3-3/lib/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/i386-linux-gnu/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/i386-linux-gnu/libqt-mt$(SUFF_DLL) \
         )))
       ifneq ($(PATH_SDK_QT3_LIB.x86),)
@@ -144 +146 @@
         /usr/lib/amd64/libqt-mt$(SUFF_DLL) \
         /usr/lib/64/libqt-mt$(SUFF_DLL) \
+        /usr/lib/x86_64-linux-gnu/libqt-mt$(SUFF_DLL) \
         /usr/local/lib64/libqt-mt$(SUFF_DLL) \
         /usr/local/lib64/qt3/libqt-mt$(SUFF_DLL) \
@@ -149 +152 @@
         /usr/local/lib/amd64/libqt-mt$(SUFF_DLL) \
         /usr/local/lib/64/libqt-mt$(SUFF_DLL) \
+        /usr/local/lib/x86_64-linux-gnu/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3/libqt-mt$(SUFF_DLL) \
         $(PATH_SDK_QT3)/lib/qt3-3/lib/libqt-mt$(SUFF_DLL) \
+        $(PATH_SDK_QT3)/lib/x86_64-linux-gnu/libqt-mt$(SUFF_DLL) \
         )))
       ifneq ($(PATH_SDK_QT3_LIB.amd64),)

trunk/kBuild/units/qt4.kmk

@@ -117 +117 @@
         /usr/lib32/libQtCore$(SUFF_DLL) \
         /usr/lib32/qt4/libQtCore$(SUFF_DLL) \
+        /usr/lib/i386-linux-gnu/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) \
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
+        $(PATH_SDK_QT4)/lib/i386-linux-gnu/libQtCore$(SUFF_DLL) \
         )))
       ifneq ($(PATH_SDK_QT4_LIB.x86),)
@@ -134 +137 @@
         /usr/lib64/qt4/libQtCore$(SUFF_DLL) \
         /usr/lib/amd64/libQtCore$(SUFF_DLL) \
+        /usr/lib/x86_64-linux-gnu/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) \
         $(PATH_SDK_QT4)/lib/libQtCore$(SUFF_DLL) \
         $(PATH_SDK_QT4)/lib/qt4/libQtCore$(SUFF_DLL) \
+        $(PATH_SDK_QT4)/lib/x86_64-linux-gnu/libQtCore$(SUFF_DLL) \
         )))
       ifneq ($(PATH_SDK_QT4_LIB.amd64),)