mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-16 20:54:05 +02:00
b5b89c2298
Based on a patch by Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26422 3c298f89-4303-0410-b956-a3cf2f4a3e73
31 lines
666 B
Diff
31 lines
666 B
Diff
--- a/squashfs-tools/Makefile
|
|
+++ b/squashfs-tools/Makefile
|
|
@@ -129,7 +129,6 @@ ifeq ($(LZMA_XZ_SUPPORT),1)
|
|
CFLAGS += -DLZMA_SUPPORT
|
|
MKSQUASHFS_OBJS += lzma_xz_wrapper.o
|
|
UNSQUASHFS_OBJS += lzma_xz_wrapper.o
|
|
-LIBS += -llzma
|
|
COMPRESSORS += lzma
|
|
endif
|
|
|
|
@@ -137,10 +136,18 @@ ifeq ($(XZ_SUPPORT),1)
|
|
CFLAGS += -DXZ_SUPPORT
|
|
MKSQUASHFS_OBJS += xz_wrapper.o
|
|
UNSQUASHFS_OBJS += xz_wrapper.o
|
|
-LIBS += -llzma
|
|
COMPRESSORS += xz
|
|
endif
|
|
|
|
+ifneq ($(LZMA_XZ_SUPPORT)$(XZ_SUPPORT),)
|
|
+ifneq ($(LZMA_LIB),)
|
|
+MKSQUASHFS_OBJS += $(LZMA_LIB)
|
|
+UNSQUASHFS_OBJS += $(LZMA_LIB)
|
|
+else
|
|
+LIBS += -llzma
|
|
+endif
|
|
+endif
|
|
+
|
|
ifeq ($(LZO_SUPPORT),1)
|
|
CFLAGS += -DLZO_SUPPORT
|
|
ifdef LZO_DIR
|