summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rbutil/bspatch/Makefile2
-rw-r--r--rbutil/bzip2/Makefile2
-rw-r--r--rbutil/rbutilqt/Makefile.libs6
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro11
4 files changed, 10 insertions, 11 deletions
diff --git a/rbutil/bspatch/Makefile b/rbutil/bspatch/Makefile
index 5fa2598bce..8f287a5ebb 100644
--- a/rbutil/bspatch/Makefile
+++ b/rbutil/bspatch/Makefile
@@ -12,6 +12,6 @@ LIBSOURCES := bspatch.c
SOURCES := main.c
OUTPUT := bspatch
-EXTRADEPS := libbzip2.a
+EXTRADEPS := libbz2.a
include ../libtools.make
diff --git a/rbutil/bzip2/Makefile b/rbutil/bzip2/Makefile
index 0af1165223..6dc59ed025 100644
--- a/rbutil/bzip2/Makefile
+++ b/rbutil/bzip2/Makefile
@@ -10,6 +10,6 @@
LIBSOURCES := blocksort.c compress.c decompress.c randtable.c \
bzlib.c crctable.c huffman.c
-OUTPUT := bzip2
+OUTPUT := bz2
include ../libtools.make
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs
index ac4e31a9e4..f95fd52ab9 100644
--- a/rbutil/rbutilqt/Makefile.libs
+++ b/rbutil/rbutilqt/Makefile.libs
@@ -34,7 +34,7 @@ export CXX=$(EXTRALIBS_CXX)
export AR=$(EXTRALIBS_AR)
export ISYSROOT=$(EXTRALIB_ISYSROOT)
-libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt
+libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbspatch libbz2 librbtomcrypt
# To support cross compiles, we explicitly pass the CC flag below for
# all tools which override CC or CXX in their makefiles. CXX is only
@@ -72,8 +72,8 @@ libmkimxboot:
libmks5lboot:
$(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/mks5lboot BUILD_DIR=$(BUILD_DIR)/mks5lboot libmks5lboot.a CC=$(CC)
-libbzip2:
- $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbzip2.a CC=$(CC)
+libbz2:
+ $(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bzip2 BUILD_DIR=$(BUILD_DIR)/bzip2 libbz2.a CC=$(CC)
libbspatch:
$(SILENT)$(MAKE) -C $(RBBASE_DIR)/rbutil/bspatch BUILD_DIR=$(BUILD_DIR)/bspatch libbspatch.a CC=$(CC)
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index b3516f796b..ced22b0628 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -93,12 +93,11 @@ extralibs.commands = $$SILENT \
RBLIBS = rbspeex ipodpatcher sansapatcher mkamsboot mktccboot \
mkmpioboot chinachippatcher mkimxboot mks5lboot bspatch ucl \
rbtomcrypt
-# 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
-}
+# NOTE: Our copy of libbzip2 has to use the name "bz2" to match up with the
+# distro name. Otherwise cross compiling would end up linking two copies of
+# bzip2 using different names, causing symbol clashes. Using the same name
+# makes the compiler pick the one he likes.
+RBLIBS += bz2
!win32-msvc* {
QMAKE_EXTRA_TARGETS += extralibs
PRE_TARGETDEPS += extralibs