summarylogtreecommitdiffstats
path: root/0025-Use-correct-pkg-config-static-flag.patch
diff options
context:
space:
mode:
authorMichel Zou2019-02-22 18:26:23 +0100
committerMichel Zou2019-02-22 18:26:23 +0100
commitea2da1870c5d80e4c77364d198aa1fad64b8c4f0 (patch)
tree09c9102d7a602ff0d04c165cec8ece1e216705cc /0025-Use-correct-pkg-config-static-flag.patch
parent12107bedc14b62761fd2de498659c6b19768d59c (diff)
downloadaur-ea2da1870c5d80e4c77364d198aa1fad64b8c4f0.tar.gz
5.12.1
Diffstat (limited to '0025-Use-correct-pkg-config-static-flag.patch')
-rw-r--r--0025-Use-correct-pkg-config-static-flag.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/0025-Use-correct-pkg-config-static-flag.patch b/0025-Use-correct-pkg-config-static-flag.patch
index 356e87434dc5..373565402722 100644
--- a/0025-Use-correct-pkg-config-static-flag.patch
+++ b/0025-Use-correct-pkg-config-static-flag.patch
@@ -1,17 +1,17 @@
-From 8f284db16131394f4532d3d3e19d6a12762b51c4 Mon Sep 17 00:00:00 2001
+From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 25/33] Use correct pkg-config --static flag
+Subject: [PATCH 25/34] Use correct pkg-config --static flag
---
configure.pri | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
-index 2cc54d15a2..449fe4b9b8 100644
+index 3136889a2f..601629c047 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -329,6 +329,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
qtLog("Found pkg-config from path: $$pkgConfig")
}
}
@@ -22,5 +22,5 @@ index 2cc54d15a2..449fe4b9b8 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.19.2
+2.20.1