NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

squashfs3: fix build when zlib isn't available on the host

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2010-05-07 21:23:31 +02:00
parent d5a1757565
commit f6c18b97ca
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/squashfs3/squashfs-3.4-build-system-fix.patch → package/squashfs3/squashfs3-3.4-build-system-fix.patch
View File

@ -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

2
package/squashfs3/squashfs3.mk
View File

@ -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