diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:16:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:16:44 +0200 |
| commit | 6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72 (patch) | |
| tree | 432513fc67dcff844ecf5c48f38bdcf1a9fe3523 /target/squashfs/squashfs-3.4-build-system-fix.patch | |
| parent | b6ebab842dbb0581526f907bf5b39cad0ac1f756 (diff) | |
| parent | 0b79c5022d32b15180a18087a0fba5a2f1af5cc7 (diff) | |
Merge branch 'fs-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'target/squashfs/squashfs-3.4-build-system-fix.patch')
| -rw-r--r-- | target/squashfs/squashfs-3.4-build-system-fix.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/target/squashfs/squashfs-3.4-build-system-fix.patch b/target/squashfs/squashfs-3.4-build-system-fix.patch deleted file mode 100644 index 5b86b008a..000000000 --- a/target/squashfs/squashfs-3.4-build-system-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -[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 - |