summaryrefslogtreecommitdiff
path: root/recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch')
-rw-r--r--recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch b/recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch
new file mode 100644
index 0000000000..eeb578ab12
--- /dev/null
+++ b/recipes/squashfs-tools/files/squashfs3.1r2-tools-lzma_Makefile.patch
@@ -0,0 +1,40 @@
+Modifies the Makefile so that it builds {mk,un}squashfs-lzma instead
+of {mk,un}squashfs. This requires the common (non-lzma) patch called
+Makefile-3.1 to be applied first.
+
+Leon Woestenberg <leonw@mailcan.com>
+
+--- squashfs-tools/Makefile 2006-10-10 16:07:43.000000000 +0200
++++ squashfs-lzma-tools/Makefile 2006-10-10 15:44:57.000000000 +0200
+@@ -1,13 +1,15 @@
+ INCLUDEDIR = .
+ CFLAGS_R = -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-LIBS = -lz -lpthread
++#LZMAPATH = ./lzma/C/7zip/Compress/LZMA_Lib
++LIBS = -llzma -lz -lpthread
+
+ CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2
+
+ all: mksquashfs unsquashfs
+
+-mksquashfs: mksquashfs.o read_fs.o sort.o
+- $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o $(LIBS) -o $@
++mksquashfs-lzma: mksquashfs.o read_fs.o sort.o
++# make -C $(LZMAPATH)
++ $(CXX) $(LDFLAGS) mksquashfs.o read_fs.o sort.o $(LIBS) -o $@
+
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h
+ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o mksquashfs.o mksquashfs.c
+@@ -18,7 +20,10 @@
+ sort.o: sort.c squashfs_fs.h global.h sort.h
+ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o sort.o sort.c
+
+-unsquashfs: unsquashfs.o
+- $(CC) unsquashfs.o -lz -o $@
++unsquashfs-lzma: unsquashfs.o
++# make -C $(LZMAPATH)
++ $(CXX) unsquashfs.o $(LIBS) -o $@
+
+ unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h
++
++clean: