Commit 58794482 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

squashfs: fix 3.4 build after be8a104c (pass CFLAGS/LDFLAGS and add host-zlib dependency) 



Commit be8a104c (pass CFLAGS/LDFLAGS and add host-zlib dependency)
changed the way make was invocated for squashfs and added a patch for 4.0,
but forgot to add an equivalent patch for 3.4.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 291fedce

CHANGES

+4 −0
Original line number Diff line number Diff line 
2010.05, Not yet released



	 Updated/fixed packages: squashfs



2010.02, Release February 26th, 2010:



	Fixes all over the tree.

target/squashfs/squashfs-3.4-build-system-fix.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
[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