diff options
author | Martchus | 2018-02-19 20:15:10 +0100 |
---|---|---|
committer | Martchus | 2018-02-19 20:15:10 +0100 |
commit | 2660e624877e04323aaac908770b038c92b7abc0 (patch) | |
tree | 6a83eda8e329fc43b34c64fb2ddcf5146d475811 /0025-Use-correct-pkg-config-static-flag.patch | |
parent | 4536f0e121fda87c68095bf7ae5d108aaf7706d3 (diff) | |
download | aur-2660e624877e04323aaac908770b038c92b7abc0.tar.gz |
Update to 5.10.1
Diffstat (limited to '0025-Use-correct-pkg-config-static-flag.patch')
-rw-r--r-- | 0025-Use-correct-pkg-config-static-flag.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0025-Use-correct-pkg-config-static-flag.patch b/0025-Use-correct-pkg-config-static-flag.patch new file mode 100644 index 000000000000..db588595a429 --- /dev/null +++ b/0025-Use-correct-pkg-config-static-flag.patch @@ -0,0 +1,26 @@ +From db3d86b75f473d02c5ce6410f7d054f320c7d8f9 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:50:21 +0200 +Subject: [PATCH 25/32] Use correct pkg-config --static flag + +--- + configure.pri | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.pri b/configure.pri +index 9da756fb3a..fa2719bb0c 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -311,6 +311,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.16.1 + |