aboutsummaryrefslogtreecommitdiffstats
path: root/tools/squashfs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-05-04 17:04:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-05-04 17:04:03 +0000
commitb20fa8f579cb24d89a203e4fa6c465ce43f784c5 (patch)
tree3a36716df73b58e3979ff08d324d6e696a3212d9 /tools/squashfs
parentd7c2fc499d4a71ad735be3210059a434eb29e550 (diff)
downloadupstream-b20fa8f579cb24d89a203e4fa6c465ce43f784c5.tar.gz
upstream-b20fa8f579cb24d89a203e4fa6c465ce43f784c5.tar.bz2
upstream-b20fa8f579cb24d89a203e4fa6c465ce43f784c5.zip
rename tools/lzma to tools/lzma-old (preparation for adding a new lzma version)
SVN-Revision: 15595
Diffstat (limited to 'tools/squashfs')
-rw-r--r--tools/squashfs/patches/100-lzma.patch10
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/squashfs/patches/100-lzma.patch b/tools/squashfs/patches/100-lzma.patch
index 1050e094d5..e3b2a3a89c 100644
--- a/tools/squashfs/patches/100-lzma.patch
+++ b/tools/squashfs/patches/100-lzma.patch
@@ -1,17 +1,11 @@
--- a/squashfs-tools/Makefile
+++ b/squashfs-tools/Makefile
-@@ -1,4 +1,5 @@
- INCLUDEDIR = .
-+#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib
-
- CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
-
@@ -7,6 +8,9 @@ all: mksquashfs unsquashfs
mksquashfs: mksquashfs.o read_fs.o sort.o
$(CC) mksquashfs.o read_fs.o sort.o -lz -o $@
+mksquashfs-lzma: mksquashfs.o read_fs.o sort.o
-+ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@
++ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma-old -o $@
+
mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
@@ -21,7 +15,7 @@
$(CC) unsquashfs.o -lz -o $@
+unsquashfs-lzma: unsquashfs.o
-+ $(CXX) unsquashfs.o -L$(LZMAPATH) -llzma -o $@
++ $(CXX) unsquashfs.o -L$(LZMAPATH) -llzma-old -o $@
+
unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
+