From 11a8887e1fca7b9273d61c9cab4041688aee9c6f Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 15 Apr 2010 16:54:54 +0200
Subject: #i109357# changes for glibc2.5

---
 moz/makefile.mk                 |  6 +++++-
 moz/patches/linux_libc2.5.patch | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 moz/patches/linux_libc2.5.patch

(limited to 'moz')

diff --git a/moz/makefile.mk b/moz/makefile.mk
index c1649d2f8b85..d827266fab50 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -83,7 +83,11 @@ TARFILE_ROOTDIR=mozilla
 PATCH_FILES = \
     seamonkey-source-$(MOZILLA_VERSION).patch \
     patches/dtoa.patch \
-    patches/respect_disable_pango.patch \
+    patches/respect_disable_pango.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)
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
+ 
-- 
cgit