diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-05-07 21:23:31 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-05-07 21:32:02 +0200 |
| commit | f6c18b97caeeae18ab2d8d19409183c6c905ec94 (patch) | |
| tree | 40e6fd58467d94a12240f6e98e1ff87a188bb862 /package | |
| parent | d5a1757565c0c5539e2728c23d9cb955fba02615 (diff) | |
| download | buildroot-novena-f6c18b97caeeae18ab2d8d19409183c6c905ec94.tar.gz buildroot-novena-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')
| -rw-r--r-- | package/squashfs3/squashfs3-3.4-build-system-fix.patch (renamed from package/squashfs3/squashfs-3.4-build-system-fix.patch) | 15 | ||||
| -rw-r--r-- | package/squashfs3/squashfs3.mk | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/package/squashfs3/squashfs-3.4-build-system-fix.patch b/package/squashfs3/squashfs3-3.4-build-system-fix.patch index 5b86b008a..3c197eb1c 100644 --- a/package/squashfs3/squashfs-3.4-build-system-fix.patch +++ b/package/squashfs3/squashfs3-3.4-build-system-fix.patch @@ -9,9 +9,9 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> 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 +--- 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 = . @@ -26,3 +26,12 @@ Index: squashfs3.4/squashfs-tools/Makefile 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 + diff --git a/package/squashfs3/squashfs3.mk b/package/squashfs3/squashfs3.mk index 5504b1426..69aab1489 100644 --- a/package/squashfs3/squashfs3.mk +++ b/package/squashfs3/squashfs3.mk @@ -18,7 +18,7 @@ define SQUASHFS3_INSTALL_TARGET_CMDS endef define HOST_SQUASHFS3_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ + $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)/squashfs-tools/ endef define HOST_SQUASHFS3_INSTALL_CMDS |