diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-08 16:11:20 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-08 16:11:20 +0200 |
| commit | af850ce10fc490036247a8c0dd92c79f18b2281a (patch) | |
| tree | ac2e608f7d34096a9211e6e2d44b36384f38bbd4 /package/squashfs3/squashfs3-3.4-build-system-fix.patch | |
| parent | 395a70f72fbba38df396717f3c930e17d0f920dc (diff) | |
| parent | f6c18b97caeeae18ab2d8d19409183c6c905ec94 (diff) | |
| download | buildroot-novena-af850ce10fc490036247a8c0dd92c79f18b2281a.tar.gz buildroot-novena-af850ce10fc490036247a8c0dd92c79f18b2281a.zip | |
Merge branch 'squashfs-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/squashfs3/squashfs3-3.4-build-system-fix.patch')
| -rw-r--r-- | package/squashfs3/squashfs3-3.4-build-system-fix.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/squashfs3/squashfs3-3.4-build-system-fix.patch b/package/squashfs3/squashfs3-3.4-build-system-fix.patch new file mode 100644 index 000000000..3c197eb1c --- /dev/null +++ b/package/squashfs3/squashfs3-3.4-build-system-fix.patch @@ -0,0 +1,37 @@ +[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 2008-08-26 09:10:13.000000000 +0200 ++++ squashfs3.4/squashfs-tools/Makefile 2010-05-06 21:09:28.000000000 +0200 +@@ -2,12 +2,12 @@ + + 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 + +@@ -16,7 +16,7 @@ + sort.o: sort.c squashfs_fs.h global.h sort.h + + unsquashfs: unsquashfs.o +- $(CC) unsquashfs.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) unsquashfs.o -lz -lpthread -lm -o $@ + + unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h + |