From 36804a986cb9d622b2221f170c1be6bcd8b38ea3 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 11 Jun 2010 16:57:49 +0000 Subject: [PATCH] I forgot a needed to copy over the updated c flags patch. The original one doesn't apply at fuzz=0 to the new Makefile. --- squashfs-cflags.patch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/squashfs-cflags.patch b/squashfs-cflags.patch index 9e2e4e8..bb325d4 100644 --- a/squashfs-cflags.patch +++ b/squashfs-cflags.patch @@ -1,13 +1,13 @@ -Index: squashfs/squashfs-tools/Makefile -=================================================================== ---- squashfs.orig/squashfs-tools/Makefile -+++ squashfs/squashfs-tools/Makefile -@@ -2,7 +2,7 @@ INSTALL_DIR = /usr/local/bin +--- squashfs-tools/Makefile.orig 2010-02-13 14:00:54.000000000 -0600 ++++ squashfs-tools/Makefile 2010-02-13 14:02:58.000000000 -0600 +@@ -27,8 +27,8 @@ + UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \ + unsquash-4.o swap.o compressor.o gzip_wrapper.o - INCLUDEDIR = . - --CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 -+CFLAGS := $(RPM_OPT_FLAGS) -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 - - all: mksquashfs unsquashfs +-CFLAGS = $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ +- -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall ++CFLAGS = $(RPM_OPT_FLAGS) $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ ++ -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" + LIBS = + ifdef LZMA_SUPPORT