mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
squashfs: fix 3.4 build after be8a104c3c (pass CFLAGS/LDFLAGS and add host-zlib dependency)
Commit be8a104c3c (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: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
4
CHANGES
4
CHANGES
@@ -1,3 +1,7 @@
|
|||||||
|
2010.05, Not yet released
|
||||||
|
|
||||||
|
Updated/fixed packages: squashfs
|
||||||
|
|
||||||
2010.02, Release February 26th, 2010:
|
2010.02, Release February 26th, 2010:
|
||||||
|
|
||||||
Fixes all over the tree.
|
Fixes all over the tree.
|
||||||
|
|||||||
28
target/squashfs/squashfs-3.4-build-system-fix.patch
Normal file
28
target/squashfs/squashfs-3.4-build-system-fix.patch
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
[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
|
||||||
|
|
||||||
Reference in New Issue
Block a user