2017-03-22 19:59:13 +01:00
|
|
|
From 2d7fb7169cfeed0c95a703b58fa7ec2412ba5daf Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Sun, 18 Sep 2016 18:50:21 +0200
|
2017-01-23 21:37:13 +01:00
|
|
|
Subject: [PATCH 23/30] Use correct pkg-config --static flag
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
---
|
2017-01-23 21:37:13 +01:00
|
|
|
configure.pri | 3 +++
|
|
|
|
1 file changed, 3 insertions(+)
|
2016-09-19 22:18:45 +02:00
|
|
|
|
2017-01-23 21:37:13 +01:00
|
|
|
diff --git a/configure.pri b/configure.pri
|
|
|
|
index 0c4b8ebbf8..8afb893e88 100644
|
|
|
|
--- a/configure.pri
|
|
|
|
+++ b/configure.pri
|
|
|
|
@@ -138,6 +138,9 @@ defineTest(qtConfTest_detectPkgConfig) {
|
|
|
|
qtLog("Found pkg-config from path: $$pkgConfig")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+ !isEmpty(pkgConfig):qtConfig(static) {
|
|
|
|
+ pkgConfig = "$$pkgConfig --static"
|
|
|
|
+ }
|
|
|
|
|
|
|
|
$$qtConfEvaluate("features.cross_compile") {
|
|
|
|
# cross compiling, check that pkg-config is set up sanely
|
2016-09-19 22:18:45 +02:00
|
|
|
--
|
2017-04-19 18:09:52 +02:00
|
|
|
2.12.2
|
2016-09-19 22:18:45 +02:00
|
|
|
|