From 82f98dea2be33f6b4b52eda4a2f92e86c9abfe32 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Thu, 6 Aug 2020 20:28:12 +0200 Subject: [PATCH] rbutil: Explicitly link bzip2 only on non-Windows. When building for Windows (at least using mxe) bzip2 clashes with existing symbols. This seems to be a similar issue as with zlib. Don't link it explicitly, so the linker uses the existing symbols. Fixes building for Windows. Change-Id: I7a1e980542961f3e7f8febedd6c0b8f04a6f6ec0 --- rbutil/rbutilqt/rbutilqt.pro | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index b48e52cefa..5897743199 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -90,7 +90,13 @@ extralibs.commands = $$SILENT \ # Note: order is important for RBLIBS! The libs are appended to the linker # flags in this order, put libucl at the end. RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \ - mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch bzip2 ucl + mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl +# NOTE: Linking bzip2 causes problems on Windows (Qt seems to export those +# symbols as well, similar to what we have with zlib.) Only link that on +# non-Windows for now. +!win32 { + RBLIBS += bzip2 +} !win32-msvc* { QMAKE_EXTRA_TARGETS += extralibs PRE_TARGETDEPS += extralibs