LibraryProbe: extend search paths

This allows to search for libraries in Linux-specific directories
such as /usr/lib/x86_64-linux-gnu on Debian.

This also enables auto-testing protobufcpp module in Travis for Linux

Change-Id: Ib8628bbbb25846d1338676619ffc8b3f15cf67b1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 29 insertions, 4 deletions

diff --git a/share/qbs/imports/qbs/Probes/LibraryProbe.qbs b/share/qbs/imports/qbs/Probes/LibraryProbe.qbs
index 26787d1b4..dfa9890a9 100644
--- a/share/qbs/imports/qbs/Probes/LibraryProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/LibraryProbe.qbs
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 PathProbe {
+    property string endianness
     nameSuffixes: {
         if (qbs.targetOS.contains("windows"))
             return [".lib"];
@@ -36,10 +37,34 @@ PathProbe {
             return [".dylib", ".a"];
         return [".so", ".a"];
     }
-    platformSearchPaths: qbs.targetOS.contains("unix") ? [
-        "/usr/lib",
-        "/usr/local/lib",
-    ] : []
+    platformSearchPaths: {
+        var result = [];
+        if (qbs.targetOS.contains("unix")) {
+            if (qbs.targetOS.contains("linux") && qbs.architecture) {
+                if (qbs.architecture === "armv7")
+                    result = ["/usr/lib/arm-linux-gnueabihf"]
+                else if (qbs.architecture === "arm64")
+                    result = ["/usr/lib/aarch64-linux-gnu"]
+                else if (qbs.architecture === "mips" && endianness === "big")
+                    result = ["/usr/lib/mips-linux-gnu"]
+                else if (qbs.architecture === "mips" && endianness === "little")
+                    result = ["/usr/lib/mipsel-linux-gnu"]
+                else if (qbs.architecture === "mips64")
+                    result = ["/usr/lib/mips64el-linux-gnuabi64"]
+                else if (qbs.architecture === "ppc")
+                    result = ["/usr/lib/powerpc-linux-gnu"]
+                else if (qbs.architecture === "ppc64")
+                    result = ["/usr/lib/powerpc64le-linux-gnu"]
+                else if (qbs.architecture === "x86_64")
+                    result = ["/usr/lib64", "/usr/lib/x86_64-linux-gnu"]
+                else if (qbs.architecture === "x86")
+                    result = ["/usr/lib32", "/usr/lib/i386-linux-gnu"]
+            }
+            result = result.concat(["/usr/lib", "/usr/local/lib"]);
+        }
+
+        return result;
+    }
     nameFilter: {
         if (qbs.targetOS.contains("unix")) {
             return function(name) {