diff options
| author | Martchus | 2019-02-05 21:22:03 +0100 |
|---|---|---|
| committer | Martchus | 2019-02-05 21:22:03 +0100 |
| commit | e7ce83a899aa41cd57c4f5e7633308ea9f82de2c (patch) | |
| tree | 2fb4326cb5f3f0db85aa3e8951598516e00cf985 /0019-Use-system-zlib-for-build-tools.patch | |
| parent | 72950419466fbc9ad84ef3c8e66bd0cefd3d389f (diff) | |
| download | aur-e7ce83a899aa41cd57c4f5e7633308ea9f82de2c.tar.gz | |
Update to 5.12.1
Diffstat (limited to '0019-Use-system-zlib-for-build-tools.patch')
| -rw-r--r-- | 0019-Use-system-zlib-for-build-tools.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch index 5b7d00d92e67..fd0e888322be 100644 --- a/0019-Use-system-zlib-for-build-tools.patch +++ b/0019-Use-system-zlib-for-build-tools.patch @@ -1,22 +1,24 @@ -From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001 +From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 -Subject: [PATCH 19/33] Use system zlib for build tools +Subject: [PATCH 19/34] Use system zlib for build tools --- - src/tools/bootstrap/bootstrap.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 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..6b1db38486 100644 +index 83e44ff9a4..4734623936 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro -@@ -135,7 +135,7 @@ macx { +@@ -135,7 +135,9 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } -!qtConfig(system-zlib)|cross_compile { -+!qtConfig(system-zlib) { ++cross_compile { ++ LIBS += -lz ++} else:!qtConfig(system-zlib) { include(../../3rdparty/zlib.pri) } else { CONFIG += no_core_dep |