ooo-build r11286 - in trunk: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Wed Jan 16 15:54:23 2008
New Revision: 11286
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11286&view=rev

Log:
2008-01-16  Petr Mladek  <pmladek suse cz>

	* patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff,
	  patches/src680/solenv-really-use-unsinged-char-on-ppc.diff,
	  patches/src680/apply: ported for ooh680-m2



Added:
   trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 16 15:54:23 2008
@@ -737,9 +737,16 @@
 # Some Novell colors ...
 novell-palette.diff, michael
 
+[ NovellOnly > ooh680-m1 ]
+
 # finally disable -fsigned-char on pcc
 solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
 
+[ NovellOnly <= ooh680-m1 ]
+
+# finally disable -fsigned-char on pcc
+solenv-really-use-unsinged-char-on-ppc-m1.diff, i#81127, n#169875, pmladek
+
 
 [ NotDebian ]
 

Added: trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc-m1.diff	Wed Jan 16 15:54:23 2008
@@ -0,0 +1,65 @@
+--- solenv/inc/unxlngppc.mk.old	2007-08-23 20:15:01.000000000 +0200
++++ solenv/inc/unxlngppc.mk	2007-08-27 12:12:19.000000000 +0200
+@@ -83,9 +83,8 @@ LINKFLAGS += -Wl,--hash-style=gnu
+ LINKFLAGS += -Wl,-zdynsort
+ .ENDIF
+ 
+-# source code is still not signed versus unsigned char clean 
+-CFLAGS=-fsigned-char -nostdinc -c
+-CFLAGSCC=-fsigned-char $(ARCH_FLAGS)
++CFLAGS=-nostdinc -c
++CFLAGSCC=$(ARCH_FLAGS)
+ 
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions 
+--- solenv/inc/unxmacx.mk.old	2007-08-03 15:55:43.000000000 +0200
++++ solenv/inc/unxmacx.mk	2007-08-27 14:36:43.000000000 +0200
+@@ -88,13 +88,13 @@ CXX*=g++
+ CC*=gcc
+ objc=cc
+ 
+-CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
++CFLAGS=-fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
+ 
+ # ---------------------------------
+ #  Compilation flags
+ # ---------------------------------
+ # Normal C compilation flags
+-CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
++CFLAGSCC=-pipe -malign-natural $(ARCH_FLAGS)
+ 
+ # Normal Objective C compilation flags
+ #OBJCFLAGS=-no-precomp
+@@ -108,7 +108,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enfor
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+ # Normal C++ compilation flags
+-CFLAGSCXX=-pipe -malign-natural -fsigned-char -Wno-long-double $(ARCH_FLAGS)
++CFLAGSCXX=-pipe -malign-natural -Wno-long-double $(ARCH_FLAGS)
+ CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ PICSWITCH:=-fPIC
+ # Other flags
+--- solenv/inc/unxlngppc4.mk.old	2007-07-24 11:14:04.000000000 +0200
++++ solenv/inc/unxlngppc4.mk	2007-08-27 15:56:25.000000000 +0200
+@@ -70,10 +70,10 @@ CXX*=g++
+ # name of C Compiler
+ CC*=gcc
+ 
+-CFLAGS+=-fsigned-char -fmessage-length=0 -c
++CFLAGS+=-fmessage-length=0 -c
+ 
+ # flags for the C++ Compiler
+-CFLAGSCC= -fsigned-char -pipe $(ARCH_FLAGS)
++CFLAGSCC= -pipe $(ARCH_FLAGS)
+ 
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+@@ -81,7 +81,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enfor
+ # Flags for disabling exception handling
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+-CFLAGSCXX= -fsigned-char -pipe -frtti $(ARCH_FLAGS)
++CFLAGSCXX= -pipe -frtti $(ARCH_FLAGS)
+ PICSWITCH:=-fPIC
+ 
+ # Compiler flags for compiling static object in multi threaded environment with graphical user interface

Modified: trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc.diff
==============================================================================
--- trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc.diff	(original)
+++ trunk/patches/src680/solenv-really-use-unsinged-char-on-ppc.diff	Wed Jan 16 15:54:23 2008
@@ -12,16 +12,18 @@
  
  # Flags for enabling exception handling
  CFLAGSEXCEPTIONS=-fexceptions 
---- solenv/inc/unxmacx.mk.old	2007-08-03 15:55:43.000000000 +0200
-+++ solenv/inc/unxmacx.mk	2007-08-27 14:36:43.000000000 +0200
-@@ -88,13 +88,13 @@ CXX*=g++
- CC*=gcc
- objc=cc
+--- solenv/inc/unxmacx.mk.old	2008-01-16 16:18:33.000000000 +0100
++++ solenv/inc/unxmacx.mk	2008-01-16 16:29:03.000000000 +0100
+@@ -90,7 +90,7 @@ CC*=gcc
+ objc*=gcc
+ objcpp*=g++
  
 -CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
 +CFLAGS=-fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
  
- # ---------------------------------
+ .IF "$(DISABLE_DEPRECATION_WARNING)" == "TRUE"
+ CFLAGS+=-Wno-deprecated-declarations
+@@ -99,7 +99,7 @@ CFLAGS+=-Wno-deprecated-declarations
  #  Compilation flags
  # ---------------------------------
  # Normal C compilation flags
@@ -30,15 +32,15 @@
  
  # Normal Objective C compilation flags
  #OBJCFLAGS=-no-precomp
-@@ -108,7 +108,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enfor
+@@ -113,7 +113,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enfor
  CFLAGS_NO_EXCEPTIONS=-fno-exceptions
  
  # Normal C++ compilation flags
 -CFLAGSCXX=-pipe -malign-natural -fsigned-char -Wno-long-double $(ARCH_FLAGS)
 +CFLAGSCXX=-pipe -malign-natural -Wno-long-double $(ARCH_FLAGS)
  CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ 
  PICSWITCH:=-fPIC
- # Other flags
 --- solenv/inc/unxlngppc4.mk.old	2007-07-24 11:14:04.000000000 +0200
 +++ solenv/inc/unxlngppc4.mk	2007-08-27 15:56:25.000000000 +0200
 @@ -70,10 +70,10 @@ CXX*=g++