gecko/security/patches/maemo-rpath-link.patch
Wan-Teh Chang 17b96c0c9b Bug 580679: Build NSS with the TLS zlib compression code.
Add the security.ssl.enable_compression preference to
enable TLS compression, disabled by default.
r=khuey,kaie,sayrer,ted.  approval2.0+ by bsmedberg.
2010-08-12 14:12:05 -07:00

31 lines
1.0 KiB
Diff

Index: mozilla/security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
retrieving revision 1.47
diff -u -8 -r1.47 Linux.mk
--- mozilla/security/coreconf/Linux.mk 29 Jul 2010 04:18:10 -0000 1.47
+++ mozilla/security/coreconf/Linux.mk 7 Aug 2010 02:59:37 -0000
@@ -149,16 +149,22 @@
DSO_LDOPTS = -shared $(ARCHFLAG)
# The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
# incorrectly reports undefined references in the libraries we link with, so
# we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
LDFLAGS += $(ARCHFLAG)
+# On Maemo, we need to use the -rpath-link flag for even the standard system
+# library directories.
+ifdef _SBOX_DIR
+LDFLAGS += -Wl,-rpath-link,/usr/lib:/lib
+endif
+
# INCLUDES += -I/usr/include -Y/usr/include/linux
G++INCLUDES = -I/usr/include/g++
#
# Always set CPU_TAG on Linux, WINCE.
#
CPU_TAG = _$(CPU_ARCH)