← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/nss/config.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/nss/lib/nss/config.mk
35
35
#
36
36
# ***** END LICENSE BLOCK *****
37
37
 
38
 
#
39
 
#  Override TARGETS variable so that only static libraries
40
 
#  are specifed as dependencies within rules.mk.
41
 
#
42
 
 
43
38
# can't do this in manifest.mn because OS_TARGET isn't defined there.
44
39
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
45
40
 
53
48
ifdef NS_USE_GCC
54
49
EXTRA_SHARED_LIBS += \
55
50
        -L$(DIST)/lib \
 
51
        -L$(NSSUTIL_LIB_DIR) \
56
52
        -lnssutil3 \
57
53
        -L$(NSPR_LIB_DIR) \
58
54
        -lplc4 \
74
70
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
75
71
EXTRA_SHARED_LIBS += \
76
72
        -L$(DIST)/lib \
 
73
        -L$(NSSUTIL_LIB_DIR) \
77
74
        -lnssutil3 \
78
75
        -L$(NSPR_LIB_DIR) \
79
76
        -lplc4 \
127
124
        ../libpkix/pkix_pl_nss/module \
128
125
        $(NULL)
129
126
 
130
 
ifeq ($(OS_TARGET),SunOS)
131
 
ifeq ($(BUILD_SUN_PKG), 1)
132
 
# The -R '$ORIGIN' linker option instructs this library to search for its
133
 
# dependencies in the same directory where it resides.
134
 
ifeq ($(USE_64), 1)
135
 
MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
136
 
else
137
 
MKSHLIB += -R '$$ORIGIN:/usr/lib/mps/secv1:/usr/lib/mps'
138
 
endif
139
 
else
140
 
MKSHLIB += -R '$$ORIGIN'
141
 
endif
142
 
endif
143
 
 
144
 
ifeq ($(OS_ARCH), HP-UX) 
145
 
ifneq ($(OS_TEST), ia64)
146
 
# pa-risc
147
 
ifeq ($(USE_64), 1)
148
 
MKSHLIB += +b '$$ORIGIN'
149
 
endif
150
 
endif
151
 
endif
152
 
 
153
127
ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
154
128
ifndef NS_USE_GCC
155
129
# Export 'mktemp' to be backward compatible with NSS 3.2.x and 3.3.x