aboutsummarylogtreecommitdiffstats
path: root/0023-Use-correct-pkg-config-static-flag.patch
diff options
context:
space:
mode:
authorMartchus2020-09-13 13:30:56 +0200
committerMartchus2020-09-13 13:30:56 +0200
commit6d17f19b24ea4dc27d6be759bafbcce8b54bd012 (patch)
treea6687000ddf8b79e31a21f9c55ecd17b651edf28 /0023-Use-correct-pkg-config-static-flag.patch
parent8598b5e1679cfdd50942e06d32dee06292b579b5 (diff)
downloadaur-6d17f19b24ea4dc27d6be759bafbcce8b54bd012.tar.gz
Update to 5.15.1
Diffstat (limited to '0023-Use-correct-pkg-config-static-flag.patch')
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index e08dbb024efc..e4988af9ef44 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 0da96acd50b724b4b46868f4938c37ea96239a1a Mon Sep 17 00:00:00 2001
+From 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/31] Use correct pkg-config --static flag
@@ -8,10 +8,10 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
-index 8b968ba297..f3ebfbc949 100644
+index 89938dfc32..121064e1f8 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -349,6 +349,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) {
qtLog("Found pkg-config from path: $$pkgConfig")
}
}
@@ -22,5 +22,5 @@ index 8b968ba297..f3ebfbc949 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.26.2
+2.28.0