diff options
| author | Martchus | 2019-06-26 14:41:33 +0200 |
|---|---|---|
| committer | Martchus | 2019-06-26 14:41:33 +0200 |
| commit | 7e9790ef70cdbf8552595445b938883ba09b475b (patch) | |
| tree | 54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0017-Use-system-zlib-for-build-tools.patch | |
| parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
| download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz | |
Update to 5.13.0
Diffstat (limited to '0017-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0017-Use-system-zlib-for-build-tools.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch new file mode 100644 index 000000000000..c9a01d9cd88c --- /dev/null +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -0,0 +1,27 @@ +From 04a04e8c11bf4ae71d4ed0d6b641b2b2ebacc565 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:04:42 +0200 +Subject: [PATCH 17/33] Use system zlib for build tools + +--- + src/tools/bootstrap/bootstrap.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro +index 83e44ff9a4..4734623936 100644 +--- a/src/tools/bootstrap/bootstrap.pro ++++ b/src/tools/bootstrap/bootstrap.pro +@@ -135,7 +135,9 @@ macx { + ../../corelib/io/qstandardpaths_win.cpp + } + +-!qtConfig(system-zlib)|cross_compile { ++cross_compile { ++ LIBS += -lz ++} else:!qtConfig(system-zlib) { + include(../../3rdparty/zlib.pri) + } else { + CONFIG += no_core_dep +-- +2.22.0 + |