diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-04-09 12:15:25 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-04-09 12:21:00 +0200 |
commit | 5ef9fe7e53956ab0a213f64c02366fbfb996bd83 (patch) | |
tree | 76786adb7bdaf9af29fdbe61061aceaf25fe0810 /package/squashfs3/squashfs-3.4-build-system-fix.patch | |
parent | 0b79c5022d32b15180a18087a0fba5a2f1af5cc7 (diff) |
squashfs3: new package
Add support for the old squashfs 3.x tools, so that squashfs 3.x root
filesystems can be generated.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/squashfs3/squashfs-3.4-build-system-fix.patch')
-rw-r--r-- | package/squashfs3/squashfs-3.4-build-system-fix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/squashfs3/squashfs-3.4-build-system-fix.patch b/package/squashfs3/squashfs-3.4-build-system-fix.patch new file mode 100644 index 000000000..5b86b008a --- /dev/null +++ b/package/squashfs3/squashfs-3.4-build-system-fix.patch @@ -0,0 +1,28 @@ +[PATCH]: squashfs-tools: Handle user supplied CFLAGS/LDFLAGS + +Properly handle make CFLAGS=.. LDFLAGS=.. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + squashfs-tools/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: squashfs3.4/squashfs-tools/Makefile +=================================================================== +--- squashfs3.4.orig/squashfs-tools/Makefile ++++ squashfs3.4/squashfs-tools/Makefile +@@ -2,12 +2,12 @@ INSTALL_DIR = /usr/local/bin + + INCLUDEDIR = . + +-CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 ++override CFLAGS += -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 + + all: mksquashfs unsquashfs + + mksquashfs: mksquashfs.o read_fs.o sort.o +- $(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ + + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h + |