← Back to branch summary

~ubuntu-branches/ubuntu/maverick/nss/maverick

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/FreeBSD.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/FreeBSD.mk
42
42
CCC                     = g++
43
43
RANLIB                  = ranlib
44
44
 
45
 
ifeq ($(OS_TEST),alpha)
46
 
CPU_ARCH                = alpha
47
 
else
48
 
CPU_ARCH                = x86
 
45
CPU_ARCH                = $(OS_TEST)
 
46
ifeq ($(CPU_ARCH),i386)
 
47
CPU_ARCH                = x86
 
48
endif
 
49
ifeq ($(CPU_ARCH),pc98)
 
50
CPU_ARCH                = x86
 
51
endif
 
52
ifeq ($(CPU_ARCH),amd64)
 
53
CPU_ARCH                = x86_64
49
54
endif
50
55
 
51
56
OS_CFLAGS               = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK