tools: migrate from squashfs4 to squashfskit4

[openwrt/openwrt.git] / tools / squashfs4 / patches / 110-allow_static_liblzma.patch

diff --git a/tools/squashfs4/patches/110-allow_static_liblzma.patch b/tools/squashfs4/patches/110-allow_static_liblzma.patch
deleted file mode 100644 (file)
index 9a3a744..0000000
--- a/tools/squashfs4/patches/110-allow_static_liblzma.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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