diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-05-04 17:04:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-05-04 17:04:03 +0000 |
| commit | 5d2d7cfd8f9a1c9cb0234590e305b6b4c0ec8d59 (patch) | |
| tree | 451936aeb32c90543e334fe56019d8c04a5d380c /tools/squashfs | |
| parent | 7d4ffdc4287a78251d258cc88557bfda390fbcc9 (diff) | |
| download | master-187ad058-5d2d7cfd8f9a1c9cb0234590e305b6b4c0ec8d59.tar.gz master-187ad058-5d2d7cfd8f9a1c9cb0234590e305b6b4c0ec8d59.tar.bz2 master-187ad058-5d2d7cfd8f9a1c9cb0234590e305b6b4c0ec8d59.zip | |
rename tools/lzma to tools/lzma-old (preparation for adding a new lzma version)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15595 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/squashfs')
| -rw-r--r-- | tools/squashfs/patches/100-lzma.patch | 10 |
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 + |