← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nss/quantal-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/ckfw/builtins/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/ckfw/builtins/config.mk
34
34
# the terms of any one of the MPL, the GPL or the LGPL.
35
35
#
36
36
# ***** END LICENSE BLOCK *****
37
 
CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.13 $ $Date: 2009/03/20 07:19:36 $"
 
37
CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.14 $ $Date: 2009/06/11 00:55:34 $"
38
38
 
39
39
#
40
40
#  Override TARGETS variable so that only shared libraries
65
65
endif
66
66
endif
67
67
 
68
 
ifeq ($(OS_TARGET),SunOS)
69
 
# The -R '$ORIGIN' linker option instructs this library to search for its
70
 
# dependencies in the same directory where it resides.
71
 
MKSHLIB += -R '$$ORIGIN'
72
 
endif
73
 
 
74
 
ifeq ($(OS_ARCH), HP-UX) 
75
 
ifneq ($(OS_TEST), ia64)
76
 
# pa-risc
77
 
ifeq ($(USE_64), 1)
78
 
MKSHLIB += +b '$$ORIGIN'
79
 
endif
80
 
endif
81
 
endif