summarylogtreecommitdiffstats
path: root/0019-Use-system-zlib-for-build-tools.patch
diff options
context:
space:
mode:
authorMichel Zou2018-05-02 20:25:59 +0200
committerMichel Zou2018-05-02 20:25:59 +0200
commit4d08d8d43697ea96da9cb31f8d1af26ecae0704d (patch)
treecc2bddc956408a1808eb3bd8941d27e96c67246b /0019-Use-system-zlib-for-build-tools.patch
downloadaur-4d08d8d43697ea96da9cb31f8d1af26ecae0704d.tar.gz
import
Diffstat (limited to '0019-Use-system-zlib-for-build-tools.patch')
-rw-r--r--0019-Use-system-zlib-for-build-tools.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch
new file mode 100644
index 000000000000..5bb33f855ce4
--- /dev/null
+++ b/0019-Use-system-zlib-for-build-tools.patch
@@ -0,0 +1,25 @@
+From d268e7908b8cd1509023bdbfd61c9140b5bf1f62 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 18 Sep 2016 18:04:42 +0200
+Subject: [PATCH 19/32] 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 042ad7adb9..7e3bc3977a 100644
+--- a/src/tools/bootstrap/bootstrap.pro
++++ b/src/tools/bootstrap/bootstrap.pro
+@@ -132,7 +132,7 @@ macx {
+ ../../corelib/io/qstandardpaths_win.cpp
+ }
+
+-!qtConfig(system-zlib)|cross_compile {
++!qtConfig(system-zlib) {
+ include(../../3rdparty/zlib.pri)
+ } else {
+ CONFIG += no_core_dep
+--
+2.16.1
+