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.
This commit is contained in:
Bruno Wolff III 2010-06-11 16:57:49 +00:00
parent cf2602f158
commit 36804a986c

View File

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