← 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/softoken/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/softoken/config.mk
37
37
 
38
38
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
39
39
CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
40
 
CRYPTODIR=../freebl
41
 
ifdef MOZILLA_SECURITY_BUILD
42
 
        CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
43
 
        CRYPTODIR=../crypto
44
 
endif
45
40
 
46
41
EXTRA_LIBS += \
47
42
        $(CRYPTOLIB) \
60
55
ifdef NS_USE_GCC
61
56
EXTRA_SHARED_LIBS += \
62
57
        -L$(DIST)/lib \
 
58
        -L$(NSSUTIL_LIB_DIR) \
63
59
        -lnssutil3 \
64
60
        -lsqlite3 \
65
61
        -L$(NSPR_LIB_DIR) \
85
81
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
86
82
EXTRA_SHARED_LIBS += \
87
83
        -L$(DIST)/lib \
 
84
        -L$(NSSUTIL_LIB_DIR) \
88
85
        -lnssutil3 \
89
86
        -lsqlite3 \
90
87
        -L$(NSPR_LIB_DIR) \
99
96
endif
100
97
 
101
98
ifeq ($(OS_TARGET),SunOS)
102
 
# The -R '$ORIGIN' linker option instructs this library to search for its
103
 
# dependencies in the same directory where it resides.
104
 
MKSHLIB += -R '$$ORIGIN'
105
99
OS_LIBS += -lbsm 
106
100
endif
107
101
 
108
 
ifeq ($(OS_ARCH), HP-UX) 
109
 
ifneq ($(OS_TEST), ia64)
110
 
# pa-risc
111
 
ifeq ($(USE_64), 1)
112
 
MKSHLIB += +b '$$ORIGIN'
113
 
endif
114
 
endif
115
 
endif
116
 
 
117
102
ifeq ($(OS_TARGET),WINCE)
118
103
DEFINES += -DDBM_USING_NSPR
119
104
endif