diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-21 12:50:25 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-21 12:50:25 +0200 |
| commit | 950e032f32f68ecdbcc0dec2b7214a66941b855d (patch) | |
| tree | 1d181a6904e9b186ae79a7655305e8cfe478487e | |
| parent | e21b183476f5055b2ccdef730c1c307080be8616 (diff) | |
| parent | a979bea9accc5d696af083f651ffa56cba5da27d (diff) | |
CWS-TOOLING: integrate CWS unxlnginewbaseline
Notes
split repo tag: libs-extern-sys_ooo/DEV300_m79
| -rw-r--r-- | moz/makefile.mk | 4 | ||||
| -rw-r--r-- | moz/patches/linux_libc2.5.patch | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 9629f7138b74..967e29688a7e 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -88,6 +88,10 @@ PATCH_FILES = \ patches/arm_build_fix.patch \ patches/link_fontconfig.patch +.IF "$(OUTPATH)"=="unxlngi6" +PATCH_FILES += patches/linux_libc2.5.patch +.ENDIF + # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) .IF "$(COM)"=="GCC" diff --git a/moz/patches/linux_libc2.5.patch b/moz/patches/linux_libc2.5.patch new file mode 100644 index 000000000000..b7f18141f457 --- /dev/null +++ b/moz/patches/linux_libc2.5.patch @@ -0,0 +1,11 @@ +--- misc/mozilla/configure 2010-04-14 18:08:55.402759185 +0200 ++++ misc/build/mozilla/configure 2010-04-14 18:07:13.036410334 +0200 +@@ -11886,7 +11886,7 @@ + $(DIST)/lib/$(LIB_PREFIX)nss'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX) \\\ + $(DIST)/lib/$(LIB_PREFIX)softokn'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX)' + else +- NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lsoftokn$NSS_VERSION" ++ NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION -lsoftokn$NSS_VERSION" + fi + fi + |