← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/Darwin.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/Darwin.mk
113
113
else
114
114
        OPTIMIZER       = -O2
115
115
endif
 
116
ifdef MOZ_DEBUG_SYMBOLS
 
117
        OPTIMIZER  += -gdwarf-2 -gfull
 
118
endif
116
119
endif
117
120
 
118
121
ARCH            = darwin
119
122
 
120
123
DSO_CFLAGS      = -fPIC
 
124
# May override this with different compatibility and current version numbers.
 
125
DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
121
126
# May override this with -bundle to create a loadable module.
122
 
DSO_LDOPTS      = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
 
127
DSO_LDOPTS      = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
123
128
 
124
129
MKSHLIB         = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
125
130
DLL_SUFFIX      = dylib
126
131
PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
127
132
                sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
128
133
 
129
 
G++INCLUDES     = -I/usr/include/g++
 
134
USE_SYSTEM_ZLIB = 1
 
135
ZLIB_LIBS       = -lz