diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-06-03 17:06:35 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-06-03 17:06:35 +0200 |
| commit | a9f9672c052728b945bf3824f5e2c28f6dddfb60 (patch) | |
| tree | e5aa3995e08b5ff3fb1b3d9e93cefc4bba59cf2a /moz | |
| parent | c8ca4c1ad3a9608614b689dc3fc79acb46120845 (diff) | |
masterfix: #i10000# removed obsolete libc patch
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 4 | ||||
| -rw-r--r-- | moz/patches/linux_libc2.5.patch | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 967e29688a7e..9629f7138b74 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -88,10 +88,6 @@ 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 deleted file mode 100644 index b7f18141f457..000000000000 --- a/moz/patches/linux_libc2.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - |