diff options
| author | Martchus | 2017-06-08 21:34:05 +0200 |
|---|---|---|
| committer | Martchus | 2017-06-08 21:34:05 +0200 |
| commit | dea669da7483affe56a58aeae1b7ddb2f7b528d9 (patch) | |
| tree | 0e69beb722c6e0ae05bd09adddab7dcc6bf9edc0 /0025-Use-correct-pkg-config-static-flag.patch | |
| parent | f67235f7789e3073e968f496c2bce838c2245662 (diff) | |
| download | aur-dea669da7483affe56a58aeae1b7ddb2f7b528d9.tar.gz | |
Update to 5.9.0
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..2e9ea114433e --- /dev/null +++ b/0025-Use-correct-pkg-config-static-flag.patch @@ -0,0 +1,26 @@ +From 8cfdb2fc2573a49866ab98ce66e4473f4512dfb9 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:50:21 +0200 +Subject: [PATCH 25/31] Use correct pkg-config --static flag + +--- + configure.pri | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.pri b/configure.pri +index 9a5c6cb30d..f8b1e3a1ab 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.13.0 + |