diff options
author | Martchus | 2019-06-26 14:41:33 +0200 |
---|---|---|
committer | Martchus | 2019-06-26 14:41:33 +0200 |
commit | 7e9790ef70cdbf8552595445b938883ba09b475b (patch) | |
tree | 54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0023-Use-correct-pkg-config-static-flag.patch | |
parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz |
Update to 5.13.0
Diffstat (limited to '0023-Use-correct-pkg-config-static-flag.patch')
-rw-r--r-- | 0023-Use-correct-pkg-config-static-flag.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch new file mode 100644 index 000000000000..f34053974c45 --- /dev/null +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -0,0 +1,26 @@ +From a36b39ed36b3c584bdd82cf31ea5d1db0228e743 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:50:21 +0200 +Subject: [PATCH 23/33] Use correct pkg-config --static flag + +--- + configure.pri | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.pri b/configure.pri +index 927fcbe132..ab5e1088b3 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -350,6 +350,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 +-- +2.22.0 + |