diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-03 01:02:00 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-03 01:02:00 +0000 |
| commit | b5b89c229819414c8bf741fef9d1a9dbb042a2da (patch) | |
| tree | 3f02232de53773909d9b65893820367f2c06de25 /tools/squashfs4/patches/110-allow_static_liblzma.patch | |
| parent | 09702f9b6732d6f4ce342eb17c4044fe2f5f462c (diff) | |
tools/squashfs4: update to version 4.2 (adds support for xz compression)
Based on a patch by Jonas Gorski
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/squashfs4/patches/110-allow_static_liblzma.patch')
| -rw-r--r-- | tools/squashfs4/patches/110-allow_static_liblzma.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tools/squashfs4/patches/110-allow_static_liblzma.patch b/tools/squashfs4/patches/110-allow_static_liblzma.patch new file mode 100644 index 0000000000..9a3a744184 --- /dev/null +++ b/tools/squashfs4/patches/110-allow_static_liblzma.patch @@ -0,0 +1,30 @@ +--- 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 |