X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fsquashfs%2Fpatches%2F100-lzma.patch;h=73f6a4e05527deebfd23c93b95e98c72f134e858;hb=34124de139842d15abe026cfb531f1144d94d979;hp=34fdcad18baeb858f5af14c45d5ae6559aabe2b7;hpb=79bd4016bc091f29a6f53cd43c42c42897cfc78f;p=lede-git%2F.git diff --git a/tools/squashfs/patches/100-lzma.patch b/tools/squashfs/patches/100-lzma.patch index 34fdcad18b..73f6a4e055 100644 --- a/tools/squashfs/patches/100-lzma.patch +++ b/tools/squashfs/patches/100-lzma.patch @@ -1,27 +1,21 @@ --- 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 @@ +@@ -7,6 +7,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 read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h -@@ -16,4 +20,9 @@ +@@ -16,4 +19,9 @@ sort.o: sort.c squashfs_fs.h global.h so unsquashfs: unsquashfs.o $(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 +