diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:37:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 11:37:43 +0000 |
| commit | 258e186dd9f7e62306f722b3c455e8ea3fb0753b (patch) | |
| tree | b0dd300c21142905104fe1714cc4027de2e83f23 /moz | |
| parent | c7c6561c11c5c5f71f1639794237af94fb2e79a6 (diff) | |
INTEGRATION: CWS sb83 (1.20.4); FILE MERGED
2008/02/22 05:59:55 sb 1.20.4.3: RESYNC: (1.20-1.21); FILE MERGED
2008/01/21 09:13:11 sb 1.20.4.2: #i84200# support for Mac OS X 10.5
2008/01/17 08:19:40 sb 1.20.4.1: #i85264# fixed broken quoting of Solaris RPATH introduced in 1.4
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 331f64c46af2..f9941f089ed8 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -276,6 +276,23 @@ if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" = 0; then _AS_PERL=1 *************** +*** 5215,5221 **** + CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common" + DLL_SUFFIX=".dylib" + DSO_LDOPTS='' +! STRIP="$STRIP -x -S" + case "${target_cpu}" in + powerpc*) + _PLATFORM_DEFAULT_TOOLKIT='mac' +--- 5215,5221 ---- + CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common" + DLL_SUFFIX=".dylib" + DSO_LDOPTS='' +! STRIP="$STRIP -X -S" # MACOSX 10.5 strip -x sometimes fails + case "${target_cpu}" in + powerpc*) + _PLATFORM_DEFAULT_TOOLKIT='mac' +*************** *** 5228,5234 **** ;; @@ -406,6 +423,23 @@ *** misc/mozilla/configure.in Tue Oct 12 06:13:29 2004 --- misc/build/mozilla/configure.in Tue Jan 15 13:34:32 2008 *************** +*** 993,999 **** + CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common" + DLL_SUFFIX=".dylib" + DSO_LDOPTS='' +! STRIP="$STRIP -x -S" + case "${target_cpu}" in + powerpc*) + _PLATFORM_DEFAULT_TOOLKIT='mac' +--- 993,999 ---- + CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common" + DLL_SUFFIX=".dylib" + DSO_LDOPTS='' +! STRIP="$STRIP -X -S" # MACOSX 10.5 strip -x sometimes fails + case "${target_cpu}" in + powerpc*) + _PLATFORM_DEFAULT_TOOLKIT='mac' +*************** *** 1006,1012 **** ;; @@ -8303,7 +8337,7 @@ endif endif DSO_LDOPTS += -G -h $(notdir $@) -+ DSO_LDOPTS += -R '\$$ORIGIN' ++ DSO_LDOPTS += -R '$$ORIGIN' endif # -KPIC generates position independent code for use in shared libraries. @@ -9526,3 +9560,22 @@ } } +*** misc/mozilla/nsprpub/pr/include/md/_pth.h +--- misc/build/mozilla/nsprpub/pr/include/md/_pth.h +*************** +*** 198,204 **** + /* + * These platforms don't have pthread_kill() + */ +! #if defined(DARWIN) + #define pthread_kill(thread, sig) ENOSYS + #endif + +--- 198,204 ---- + /* + * These platforms don't have pthread_kill() + */ +! #if defined(DARWIN) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050 + #define pthread_kill(thread, sig) ENOSYS + #endif + |