rpms/squashfs-tools/devel squashfs-cflags.patch,1.6,1.7

Bruno Wolff III bruno at fedoraproject.org
Fri Jun 11 16:57:49 UTC 2010


Author: bruno

Update of /cvs/pkgs/rpms/squashfs-tools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23310

Modified Files:
	squashfs-cflags.patch 
Log Message:
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:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: squashfs-cflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squashfs-tools/devel/squashfs-cflags.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- squashfs-cflags.patch	16 Mar 2009 18:41:56 -0000	1.6
+++ squashfs-cflags.patch	11 Jun 2010 16:57:49 -0000	1.7
@@ -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



More information about the scm-commits mailing list