2018-03-17 17:08:22 +01:00
|
|
|
From 64df7c1f38cab38957670a7070260fedde236990 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
|
2018-02-15 00:14:36 +01:00
|
|
|
Subject: [PATCH 25/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
|
2018-02-15 00:14:36 +01:00
|
|
|
index 9da756fb3a..fa2719bb0c 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/configure.pri
|
|
|
|
+++ b/configure.pri
|
2017-06-02 18:20:04 +02:00
|
|
|
@@ -311,6 +311,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
|
|
|
--
|
2018-03-17 17:08:22 +01:00
|
|
|
2.16.2
|
2016-09-19 22:18:45 +02:00
|
|
|
|