12345678910111213141516171819202122232425262728293031323334353637 |
- [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 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 = .
-
- -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
-
- @@ -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
-
|