strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS cmcfixes50

Browse source 
2008-11-10 13:31:50 +0100 cmc  r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc  r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc  r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc  r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc  r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc  r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc  r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc  r263311 :
This commit is contained in:
Rüdiger Timm 2008-11-10 15:06:12 +00:00
parent 561b0e3e6e
commit 8cfad96d6c
1 changed files with 72 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
moz/mozilla-source-1.7.5.patch
View file

@ -8191,7 +8191,29 @@
*** misc/mozilla/security/coreconf/Linux.mk Wed Feb 11 03:33:51 2004
--- misc/build/mozilla/security/coreconf/Linux.mk Tue Jan 15 13:34:36 2008
***************
*** 123,129 ****
*** 54,59 ****
--- 54,66 ----
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = m68k
else
+ ifeq ($(OS_TEST),ppc64)
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = ppc
+ ifeq ($(USE_64),1)
+ ARCHFLAG = -m64
+ endif
+ else
ifeq ($(OS_TEST),ppc)
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = ppc
***************
*** 117,129 ****
endif
endif
endif
LIBC_TAG = _glibc
ifeq ($(OS_RELEASE),2.0)
OS_REL_CFLAGS += -DLINUX2_0
@ -8199,7 +8221,14 @@
ifdef BUILD_OPT
OPTIMIZER = -O2
endif
--- 123,129 ----
--- 124,137 ----
endif
endif
endif
+ endif
LIBC_TAG = _glibc
ifeq ($(OS_RELEASE),2.0)
OS_REL_CFLAGS += -DLINUX2_0
@ -8208,12 +8237,37 @@
OPTIMIZER = -O2
endif
***************
*** 149,154 ****
--- 149,155 ----
*** 138,144 ****
OS_PTHREAD = -lpthread
endif
! OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
OS_LIBS = -L/lib $(OS_PTHREAD) -ldl -lc
ifdef USE_PTHREADS
--- 146,152 ----
OS_PTHREAD = -lpthread
endif
! OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
OS_LIBS = -L/lib $(OS_PTHREAD) -ldl -lc
ifdef USE_PTHREADS
***************
*** 148,154 ****
ARCH = linux
DSO_CFLAGS = -fPIC
DSO_LDOPTS = -shared
+ DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
! DSO_LDOPTS = -shared
DSO_LDFLAGS =
# INCLUDES += -I/usr/include -Y/usr/include/linux
--- 156,163 ----
ARCH = linux
DSO_CFLAGS = -fPIC
! DSO_LDOPTS = -shared $(ARCHFLAG)
! DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
DSO_LDFLAGS =
# INCLUDES += -I/usr/include -Y/usr/include/linux
@ -9579,3 +9633,15 @@
#define pthread_kill(thread, sig) ENOSYS
#endif
*** misc/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp
--- misc/build/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp
***************
*** 25,31 ****
#include "xptcprivate.h"
#include <stdint.h>
- #include <iostream.h>
// "This code is for IA64 only"
--- 25,30 ----