aboutsummarylogtreecommitdiffstats
path: root/0018-Use-system-zlib-for-build-tools.patch
diff options
context:
space:
mode:
authorMartchus2016-12-08 20:43:55 +0100
committerMartchus2016-12-08 20:43:55 +0100
commita94085d68ee1be47d696050fe68520b249ce648d (patch)
tree3f313dd74908ea03837110d4a03c0712c5c2779c /0018-Use-system-zlib-for-build-tools.patch
parent6690722a818a0a950d51c315349a15c225675a23 (diff)
downloadaur-a94085d68ee1be47d696050fe68520b249ce648d.tar.gz
Fix misc issues
Diffstat (limited to '0018-Use-system-zlib-for-build-tools.patch')
-rw-r--r--0018-Use-system-zlib-for-build-tools.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/0018-Use-system-zlib-for-build-tools.patch b/0018-Use-system-zlib-for-build-tools.patch
new file mode 100644
index 000000000000..b20a0d6d25e8
--- /dev/null
+++ b/0018-Use-system-zlib-for-build-tools.patch
@@ -0,0 +1,25 @@
+From 2e7791965e771e6d4a544a6b81e86cba8ad6b181 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 18:04:42 +0200
+Subject: [PATCH 18/26] Use system zlib for build tools
+
+---
+ src/tools/bootstrap/bootstrap.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
+index a431052..b97ff0a 100644
+--- a/src/tools/bootstrap/bootstrap.pro
++++ b/src/tools/bootstrap/bootstrap.pro
+@@ -134,7 +134,7 @@ macx {
+ ../../corelib/io/qstandardpaths_win.cpp
+ }
+
+-contains(QT_CONFIG, zlib)|cross_compile {
++contains(QT_CONFIG, zlib) {
+ include(../../3rdparty/zlib.pri)
+ } else {
+ CONFIG += no_core_dep
+--
+2.10.2
+