diff options
| author | Martchus | 2019-06-26 14:41:36 +0200 |
|---|---|---|
| committer | Martchus | 2019-06-26 14:41:36 +0200 |
| commit | f817cbcc8c47496a5967fa06c162cddfa98f386a (patch) | |
| tree | 62a3008a3b3ebe67f5007c5f46ed48b85ea5c383 /0019-Use-system-zlib-for-build-tools.patch | |
| parent | 7cd2ce36c60bf5e1ad40f9af6ef97c9c539d345c (diff) | |
| download | aur-f817cbcc8c47496a5967fa06c162cddfa98f386a.tar.gz | |
Update to 5.13.0
Diffstat (limited to '0019-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0019-Use-system-zlib-for-build-tools.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch deleted file mode 100644 index 25d5a0df661d..000000000000 --- a/0019-Use-system-zlib-for-build-tools.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1249cece89416ca3aae9f8edef37738d6405b846 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sun, 18 Sep 2016 18:04:42 +0200 -Subject: [PATCH 19/34] 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.21.0 - |