putty/putty-01-werror.diff

92 lines
3.2 KiB
Diff

---
macosx/Makefile | 2 +-
mkfiles.pl | 6 +++---
unix/Makefile.gtk | 2 +-
unix/Makefile.ux | 2 +-
unix/configure.ac | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
Index: putty-0.62/macosx/Makefile
===================================================================
--- putty-0.62.orig/macosx/Makefile
+++ putty-0.62/macosx/Makefile
@@ -104,7 +104,7 @@
#
CC = $(TOOLPATH)gcc
-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
+CFLAGS = -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
-I../macosx/
MLDFLAGS = -framework Cocoa
ULDFLAGS =
Index: putty-0.62/mkfiles.pl
===================================================================
--- putty-0.62.orig/mkfiles.pl
+++ putty-0.62/mkfiles.pl
@@ -960,7 +960,7 @@ if (defined $makefiles{'gtk'}) {
"\n".
"unexport CFLAGS # work around a weird issue with krb5-config\n".
"\n".
- &splitline("CFLAGS = -O2 -Wall -Werror -g " .
+ &splitline("CFLAGS = -O2 -Wall -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
" \$(shell \$(GTK_CONFIG) --cflags)").
" -D _FILE_OFFSET_BITS=64\n".
@@ -1039,7 +1039,7 @@ if (defined $makefiles{'unix'}) {
"\n".
"unexport CFLAGS # work around a weird issue with krb5-config\n".
"\n".
- &splitline("CFLAGS = -O2 -Wall -Werror -g " .
+ &splitline("CFLAGS = -O2 -Wall -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs)).
" -D _FILE_OFFSET_BITS=64\n".
"ULDFLAGS = \$(LDFLAGS)\n".
@@ -1236,7 +1236,7 @@ if (defined $makefiles{'osx'}) {
print
"CC = \$(TOOLPATH)gcc\n".
"\n".
- &splitline("CFLAGS = -O2 -Wall -Werror -g " .
+ &splitline("CFLAGS = -O2 -Wall -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
"MLDFLAGS = -framework Cocoa\n".
"ULDFLAGS =\n".
Index: putty-0.62/unix/Makefile.gtk
===================================================================
--- putty-0.62.orig/unix/Makefile.gtk
+++ putty-0.62/unix/Makefile.gtk
@@ -119,7 +119,7 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-2.0
unexport CFLAGS # work around a weird issue with krb5-config
-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
+CFLAGS = -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
-I../macosx/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64
XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs)
ULDFLAGS = $(LDFLAGS)
Index: putty-0.62/unix/Makefile.ux
===================================================================
--- putty-0.62.orig/unix/Makefile.ux
+++ putty-0.62/unix/Makefile.ux
@@ -111,7 +111,7 @@ CC = $(TOOLPATH)cc
unexport CFLAGS # work around a weird issue with krb5-config
-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
+CFLAGS = -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
-I../macosx/ -D _FILE_OFFSET_BITS=64
ULDFLAGS = $(LDFLAGS)
INSTALL=install
Index: putty-0.62/unix/configure.ac
===================================================================
--- putty-0.62.orig/unix/configure.ac
+++ putty-0.62/unix/configure.ac
@@ -11,7 +11,7 @@ AC_CONFIG_HEADERS([uxconfig.h:uxconfig.i
AC_PROG_INSTALL
AC_PROG_CC
if test "X$GCC" = Xyes; then
- PUTTYCFLAGS="-Wall -Werror"
+ PUTTYCFLAGS="-Wall"
else
PUTTYCFLAGS=""
fi