diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:17:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:17:57 +0200 |
| commit | 3f583771a42fab0eb0bb627d1a0e91eb542df287 (patch) | |
| tree | 2b107946e876e5b789b79d42ef229e651f2bc786 /package/squashfs3/squashfs-3.4-build-system-fix.patch | |
| parent | 6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72 (diff) | |
| parent | b8cee9fb4380a8d58a324d141dcab68a4c3aa29c (diff) | |
| download | buildroot-novena-3f583771a42fab0eb0bb627d1a0e91eb542df287.tar.gz buildroot-novena-3f583771a42fab0eb0bb627d1a0e91eb542df287.zip | |
Merge branch 'squashfs3' of git://git.busybox.net/~tpetazzoni/git/buildroot
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 + |