summaryrefslogtreecommitdiffstats
path: root/tools/squashfs/patches
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-04 17:04:03 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-04 17:04:03 +0000
commit037bb6d7528ccff4bc085d59644571be6c780758 (patch)
tree451936aeb32c90543e334fe56019d8c04a5d380c /tools/squashfs/patches
parentfce7c41b489b2dffc2baf949df6fc52be64fd9dd (diff)
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/patches')
-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 1050e094d..e3b2a3a89 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
+