diff options
author | Martchus | 2017-10-16 19:36:24 +0200 |
---|---|---|
committer | Martchus | 2017-10-16 19:36:24 +0200 |
commit | 3e19ccfbbef7d70aff50d047063155091be8c4e8 (patch) | |
tree | f5b27b98148bef5f91e884b86528d7a6700a7fac /0026-Use-correct-pkg-config-static-flag.patch | |
parent | 94def18b2668f9650f74ffec756e176ccc4c4fb3 (diff) | |
download | aur-3e19ccfbbef7d70aff50d047063155091be8c4e8.tar.gz |
Update to 5.9.2
Diffstat (limited to '0026-Use-correct-pkg-config-static-flag.patch')
-rw-r--r-- | 0026-Use-correct-pkg-config-static-flag.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0026-Use-correct-pkg-config-static-flag.patch b/0026-Use-correct-pkg-config-static-flag.patch new file mode 100644 index 000000000000..15c749e6f830 --- /dev/null +++ b/0026-Use-correct-pkg-config-static-flag.patch @@ -0,0 +1,26 @@ +From f2ff6d5023bd834b0110a97a16e085c3914335a7 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:50:21 +0200 +Subject: [PATCH 26/33] Use correct pkg-config --static flag + +--- + configure.pri | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.pri b/configure.pri +index a05c3d98e6..8dc874a74d 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.14.2 + |