2019-11-09 03:03:56 +01:00
|
|
|
From a618febf21e6118164eac2d0548e278bc2992941 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
|
2019-11-09 03:03:56 +01:00
|
|
|
Subject: [PATCH 23/32] 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
|
2019-11-09 03:03:56 +01:00
|
|
|
index c108b2843c..9525dd6336 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/configure.pri
|
|
|
|
|
+++ b/configure.pri
|
2019-11-09 03:03:56 +01:00
|
|
|
@@ -345,6 +345,9 @@ defineTest(qtConfTest_detectPkgConfig) {
|
2017-01-23 21:37:13 +01:00
|
|
|
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
|
|
|
--
|
2019-11-09 03:03:56 +01:00
|
|
|
2.24.0
|
2016-09-19 22:18:45 +02:00
|
|
|
|
