From a02a59b0aea0f8114aa41983c59e4fb13f8c5f8e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 10 Mar 2008 12:23:28 +0000 Subject: [PATCH] - more replaces Changed files: openoffice.org-gcc-Wextra.patch -> 1.2 --- openoffice.org-gcc-Wextra.patch | 198 ++++++++++++++++++++++++++++++-- 1 file changed, 187 insertions(+), 11 deletions(-) diff --git a/openoffice.org-gcc-Wextra.patch b/openoffice.org-gcc-Wextra.patch index 8bb6695..06a37a7 100644 --- a/openoffice.org-gcc-Wextra.patch +++ b/openoffice.org-gcc-Wextra.patch @@ -1,11 +1,187 @@ ---- ooo-build/patches/src680/cws-ia64port01.diff~ 2008-02-27 11:03:40.000000000 +0000 -+++ ooo-build/patches/src680/cws-ia64port01.diff 2008-03-09 17:46:51.488011431 +0000 -@@ -206,7 +206,7 @@ - +CFLAGSOUTOBJ=-o - + - +# -Wshadow does not work for C with nested uses of pthread_cleanup_push: --+CFLAGSWARNCC=-Wall -Wextra -Wendif-labels -++CFLAGSWARNCC=-Wall -Wendif-labels - +CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ - + -Wno-non-virtual-dtor - +CFLAGSWALLCC=$(CFLAGSWARNCC) +--- solenv/inc/unxbsdi.mk 2007-12-12 13:18:23.000000000 +0000 ++++ solenv/inc-new/unxbsdi.mk 2008-03-10 09:16:59.398817758 +0000 +@@ -100,7 +100,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxbsdi2.mk 2007-12-12 13:18:36.000000000 +0000 ++++ solenv/inc-new/unxbsdi2.mk 2008-03-10 09:16:59.402151012 +0000 +@@ -110,7 +110,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxbsds.mk 2007-12-12 13:18:50.000000000 +0000 ++++ solenv/inc-new/unxbsds.mk 2008-03-10 09:16:59.402151012 +0000 +@@ -101,7 +101,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxfbsd.mk 2007-12-12 13:19:03.000000000 +0000 ++++ solenv/inc-new/unxfbsd.mk 2008-03-10 09:16:59.402151012 +0000 +@@ -123,7 +123,7 @@ + CFLAGSOUTOBJ=-o + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels ++CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor + CFLAGSWALLCC=$(CFLAGSWARNCC) +--- solenv/inc/unxlnga.mk 2008-03-10 07:36:42.039925934 +0000 ++++ solenv/inc-new/unxlnga.mk 2008-03-10 09:16:59.412150776 +0000 +@@ -131,7 +131,7 @@ + CFLAGSOUTOBJ=-o + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels ++CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor + CFLAGSWALLCC=$(CFLAGSWARNCC) +--- solenv/inc/unxlngi4.mk 2008-03-10 07:36:49.826409660 +0000 ++++ solenv/inc-new/unxlngi4.mk 2008-03-10 09:16:59.415484030 +0000 +@@ -122,7 +122,7 @@ + .ENDIF + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxlngi6.mk 2008-03-10 07:36:50.066404021 +0000 ++++ solenv/inc-new/unxlngi6.mk 2008-03-10 09:16:59.412150776 +0000 +@@ -128,7 +128,7 @@ + CFLAGSOUTOBJ=-o + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels ++CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor + CFLAGSWALLCC=$(CFLAGSWARNCC) +--- solenv/inc/unxlngmips.mk 2007-11-02 15:20:37.000000000 +0000 ++++ solenv/inc-new/unxlngmips.mk 2008-03-10 09:16:59.405484267 +0000 +@@ -128,7 +128,7 @@ + CFLAGSOUTOBJ=-o + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels ++CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor + CFLAGSWALLCC=$(CFLAGSWARNCC) +--- solenv/inc/unxlngp.mk 2007-03-09 09:09:38.000000000 +0000 ++++ solenv/inc-new/unxlngp.mk 2008-03-10 09:16:59.405484267 +0000 +@@ -83,7 +83,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxlngppc.mk 2008-03-10 07:36:48.483107887 +0000 ++++ solenv/inc-new/unxlngppc.mk 2008-03-10 09:16:59.405484267 +0000 +@@ -127,7 +127,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxlngppc4.mk 2007-12-12 13:20:25.000000000 +0000 ++++ solenv/inc-new/unxlngppc4.mk 2008-03-10 09:16:59.405484267 +0000 +@@ -118,7 +118,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxlngs.mk 2008-03-10 07:36:48.486441142 +0000 ++++ solenv/inc-new/unxlngs.mk 2008-03-10 09:16:59.408817521 +0000 +@@ -126,7 +126,7 @@ + .ENDIF + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxlngx6.mk 2008-03-10 07:36:50.066404021 +0000 ++++ solenv/inc-new/unxlngx6.mk 2008-03-10 09:16:59.415484030 +0000 +@@ -131,7 +131,7 @@ + CFLAGSOUTOBJ=-o + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels ++CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor + CFLAGSWALLCC=$(CFLAGSWARNCC) +--- solenv/inc/unxlnxi.mk 2007-03-09 09:10:59.000000000 +0000 ++++ solenv/inc-new/unxlnxi.mk 2008-03-10 09:16:59.408817521 +0000 +@@ -81,7 +81,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/unxmacx.mk 2008-03-10 07:36:39.959974801 +0000 ++++ solenv/inc-new/unxmacx.mk 2008-03-10 09:16:59.412150776 +0000 +@@ -143,7 +143,7 @@ + CFLAGSNOOPT=-O0 + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-# -Wextra doesn not work for gcc-3.3 ++# doesn not work for gcc-3.3 + CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor +--- solenv/inc/unxscoi.mk 2007-03-09 09:11:23.000000000 +0000 ++++ solenv/inc-new/unxscoi.mk 2008-03-10 09:16:59.408817521 +0000 +@@ -68,7 +68,7 @@ + CFLAGSWARNCC= + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWALLCC=-Wall -Wextra -Wendif-labels ++CFLAGSWALLCC=-Wall -Wendif-labels + CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy + CFLAGSWERRCC=-Werror + +--- solenv/inc/wntgcci6.mk 2007-10-15 12:42:14.000000000 +0000 ++++ solenv/inc-new/wntgcci6.mk 2008-03-10 09:16:59.408817521 +0000 +@@ -78,7 +78,7 @@ + CDEFS+=-DWIN32 -DWINVER=0x400 -D_WIN32_IE=0x400 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED + + # -Wshadow does not work for C with nested uses of pthread_cleanup_push: +-CFLAGSWARNCC=-Wall -Wextra -Wendif-labels ++CFLAGSWARNCC=-Wall -Wendif-labels + CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ + -Wno-non-virtual-dtor -Wno-uninitialized + CFLAGSWALLCC=$(CFLAGSWARNCC) -- 2.44.0