diff options
| author | Thomas Petazzoni | 2010-05-07 21:23:31 +0200 |
|---|---|---|
| committer | Thomas Petazzoni | 2010-05-07 21:32:02 +0200 |
| commit | f6c18b97caeeae18ab2d8d19409183c6c905ec94 (patch) | |
| tree | 40e6fd58467d94a12240f6e98e1ff87a188bb862 /package/squashfs3/squashfs-3.4-build-system-fix.patch | |
| parent | squashfs: fix build when zlib isn't available on the host (diff) | |
| download | buildroot-f6c18b97caeeae18ab2d8d19409183c6c905ec94.tar.gz buildroot-f6c18b97caeeae18ab2d8d19409183c6c905ec94.tar.xz buildroot-f6c18b97caeeae18ab2d8d19409183c6c905ec94.zip | |
squashfs3: fix build when zlib isn't available on the host
We need to pass CFLAGS and LDFLAGS, and to rename the patch so that it
actually gets applied.
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, 0 insertions, 28 deletions
diff --git a/package/squashfs3/squashfs-3.4-build-system-fix.patch b/package/squashfs3/squashfs-3.4-build-system-fix.patch deleted file mode 100644 index 5b86b008a..000000000 --- a/package/squashfs3/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 - |