diff options
| author | Martchus | 2016-12-08 21:20:14 +0100 |
|---|---|---|
| committer | Martchus | 2016-12-08 21:20:14 +0100 |
| commit | ad140bfce5f9eb398e54c829668bac5277f7f2c1 (patch) | |
| tree | 7d8911b3ea7b530587c8cb9a0e913d91ad90a96c /0018-Use-system-zlib-for-build-tools.patch | |
| parent | d226ad19f2d078deedaf41de6dd6a3ee232784b3 (diff) | |
| download | aur-ad140bfce5f9eb398e54c829668bac5277f7f2c1.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.patch | 25 |
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 + |