summaryrefslogtreecommitdiffstats
path: root/package/squashfs/squashfs-4.1-build-system-fix.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-09-20 16:19:26 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-09-20 16:21:20 +0200
commit785fef108ebd940aeabe7e5c2d6d5f54f98e6146 (patch)
treeba65c40a5e609df2fa073e28e5139f1125ca619a /package/squashfs/squashfs-4.1-build-system-fix.patch
parent3df6b56f53a0dd92752a23e63a0ee5fcacc8ffd0 (diff)
downloadbuildroot-novena-785fef108ebd940aeabe7e5c2d6d5f54f98e6146.tar.gz
buildroot-novena-785fef108ebd940aeabe7e5c2d6d5f54f98e6146.zip
squashfs: bump 4.x, add lzo support
We'll need libattr/xz packages in BR to enable support for those. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/squashfs/squashfs-4.1-build-system-fix.patch')
-rw-r--r--package/squashfs/squashfs-4.1-build-system-fix.patch102
1 files changed, 102 insertions, 0 deletions
diff --git a/package/squashfs/squashfs-4.1-build-system-fix.patch b/package/squashfs/squashfs-4.1-build-system-fix.patch
new file mode 100644
index 000000000..709f1de1e
--- /dev/null
+++ b/package/squashfs/squashfs-4.1-build-system-fix.patch
@@ -0,0 +1,102 @@
+[PATCH]: allow custom EXTRA_CFLAGS/LDFLAGS/*_SUPPORT on the make cmd line
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ squashfs-tools/Makefile | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+Index: squashfs4.1/squashfs-tools/Makefile
+===================================================================
+--- squashfs4.1.orig/squashfs-tools/Makefile
++++ squashfs4.1/squashfs-tools/Makefile
+@@ -87,11 +87,11 @@ MKSQUASHFS_OBJS = mksquashfs.o read_fs.o
+ UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \
+ unsquash-4.o swap.o compressor.o
+
+-CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+- -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall
++CFLAGS = $(EXTRA_CFLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
++ -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -Wall
+
+ LIBS =
+-ifdef GZIP_SUPPORT
++ifeq ($(GZIP_SUPPORT),1)
+ CFLAGS += -DGZIP_SUPPORT
+ MKSQUASHFS_OBJS += gzip_wrapper.o
+ UNSQUASHFS_OBJS += gzip_wrapper.o
+@@ -99,7 +99,7 @@ LIBS += -lz
+ COMPRESSORS += gzip
+ endif
+
+-ifdef LZMA_SUPPORT
++ifeq ($(LZMA_SUPPORT),1)
+ LZMA_OBJS = $(LZMA_DIR)/C/Alloc.o $(LZMA_DIR)/C/LzFind.o \
+ $(LZMA_DIR)/C/LzmaDec.o $(LZMA_DIR)/C/LzmaEnc.o $(LZMA_DIR)/C/LzmaLib.o
+ INCLUDEDIR += -I$(LZMA_DIR)/C
+@@ -109,7 +109,7 @@ UNSQUASHFS_OBJS += lzma_wrapper.o $(LZMA
+ COMPRESSORS += lzma
+ endif
+
+-ifdef XZ_SUPPORT
++ifeq ($(XZ_SUPPORT),1)
+ CFLAGS += -DLZMA_SUPPORT
+ MKSQUASHFS_OBJS += xz_wrapper.o
+ UNSQUASHFS_OBJS += xz_wrapper.o
+@@ -117,7 +117,7 @@ LIBS += -llzma
+ COMPRESSORS += lzma
+ endif
+
+-ifdef LZO_SUPPORT
++ifeq ($(LZO_SUPPORT),1)
+ CFLAGS += -DLZO_SUPPORT
+ ifdef LZO_DIR
+ INCLUDEDIR += -I$(LZO_DIR)/include
+@@ -129,8 +129,8 @@ LIBS += $(LZO_LIBDIR) -llzo2
+ COMPRESSORS += lzo
+ endif
+
+-ifdef XATTR_SUPPORT
+-ifdef XATTR_DEFAULT
++ifeq ($(XATTR_SUPPORT),1)
++ifeq ($(XATTR_DEFAULT),1)
+ CFLAGS += -DXATTR_SUPPORT -DXATTR_DEFAULT
+ else
+ CFLAGS += -DXATTR_SUPPORT
+@@ -142,7 +142,7 @@ endif
+ #
+ # If LZMA_SUPPORT is specified then LZO_DIR must be specified too
+ #
+-ifdef LZMA_SUPPORT
++ifeq ($(LZMA_SUPPORT),1)
+ ifndef LZMA_DIR
+ $(error "LZMA_SUPPORT requires LZMA_DIR to be also defined")
+ endif
+@@ -151,8 +151,8 @@ endif
+ #
+ # Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified
+ #
+-ifdef XZ_SUPPORT
+-ifdef LZMA_SUPPORT
++ifeq ($(XZ_SUPPORT),1)
++ifeq ($(LZMA_SUPPORT),1)
+ $(error "Both XZ_SUPPORT and LZMA_SUPPORT cannot be specified")
+ endif
+ endif
+@@ -175,7 +175,7 @@ endif
+ all: mksquashfs unsquashfs
+
+ mksquashfs: $(MKSQUASHFS_OBJS)
+- $(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
++ $(CC) $(EXTRA_LDFLAGS) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
+
+ mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \
+ squashfs_swap.h xattr.h
+@@ -195,7 +195,7 @@ xattr.o: xattr.h
+ read_xattrs.o: xattr.h
+
+ unsquashfs: $(UNSQUASHFS_OBJS)
+- $(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
++ $(CC) $(EXTRA_LDFLAGS) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@
+
+ unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \
+ squashfs_compat.h global.h xattr.h