← 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/sqlite/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/sqlite/config.mk
55
55
endif
56
56
 
57
57
ifeq ($(OS_TARGET),SunOS)
58
 
# The -R '$ORIGIN' linker option instructs this library to search for its
59
 
# dependencies in the same directory where it resides.
60
 
MKSHLIB += -R '$$ORIGIN'
61
58
OS_LIBS += -lbsm 
62
59
endif
63
60
 
64
 
ifeq ($(OS_ARCH), HP-UX) 
65
 
ifneq ($(OS_TEST), ia64)
66
 
# pa-risc
67
 
ifeq ($(USE_64), 1)
68
 
MKSHLIB += +b '$$ORIGIN'
69
 
endif
70
 
endif
 
61
ifeq ($(OS_TARGET),Darwin)
 
62
# These version numbers come from the -version-info 8:6:8 libtool option in
 
63
# sqlite upstream's Makefile.in.  (Given -version-info current:revision:age,
 
64
# libtool passes
 
65
#     -compatibility_version current+1 -current_version current+1.revision
 
66
# to the linker.)  Apple builds the system libsqlite3.dylib with these
 
67
# version numbers, so we use the same to be compatible.
 
68
DARWIN_DYLIB_VERSIONS = -compatibility_version 9 -current_version 9.6
71
69
endif