← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/HP-UX.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/HP-UX.mk
76
76
 
77
77
LDFLAGS                 = -z -Wl,+s
78
78
 
79
 
MKSHLIB                 = $(LD) $(DSO_LDOPTS)
 
79
MKSHLIB                 = $(LD) $(DSO_LDOPTS) $(RPATH)
80
80
ifdef MAPFILE
81
81
MKSHLIB += -c $(MAPFILE)
82
82
endif
84
84
         sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@
85
85
 
86
86
DSO_LDOPTS              = -b +h $(notdir $@)
87
 
ifeq ($(OS_TEST),ia64)
88
 
        DSO_LDOPTS      += +b '$$ORIGIN'
89
 
endif
90
 
DSO_LDFLAGS             =
 
87
RPATH                   = +b '$$ORIGIN'
 
88
ifneq ($(OS_TEST),ia64)
 
89
# pa-risc
 
90
ifndef USE_64
 
91
RPATH                   =
 
92
endif
 
93
endif
91
94
 
92
95
# +Z generates position independent code for use in shared libraries.
93
96
DSO_CFLAGS = +Z