← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/SunOS5.mk

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/coreconf/SunOS5.mk
113
113
# Purify doesn't like -MDupdate
114
114
NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
115
115
 
116
 
MKSHLIB  = $(CC) $(DSO_LDOPTS)
 
116
MKSHLIB  = $(CC) $(DSO_LDOPTS) $(RPATH)
117
117
ifdef NS_USE_GCC
118
118
ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
119
119
        GCC_USE_GNU_LD = 1
166
166
 
167
167
NOSUCHFILE   = /solaris-rm-f-sucks
168
168
 
 
169
ifeq ($(BUILD_SUN_PKG), 1)
 
170
# The -R '$ORIGIN' linker option instructs this library to search for its
 
171
# dependencies in the same directory where it resides.
 
172
ifeq ($(USE_64), 1)
 
173
RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
 
174
else
 
175
RPATH = -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
 
176
endif
 
177
else
 
178
RPATH = -R '$$ORIGIN'
 
179
endif
 
180