← Back to branch summary

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

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/Linux.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/Linux.mk
52
52
 
53
53
DEFAULT_COMPILER = gcc
54
54
 
55
 
ifeq ($(OS_TEST),m68k)
56
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
57
 
        CPU_ARCH        = m68k
58
 
else
59
55
ifeq ($(OS_TEST),ppc64)
60
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
61
56
        CPU_ARCH        = ppc
62
57
ifeq ($(USE_64),1)
63
58
        ARCHFLAG        = -m64
64
59
endif
65
60
else
66
 
ifeq ($(OS_TEST),ppc)
67
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
68
 
        CPU_ARCH        = ppc
69
 
else
70
61
ifeq ($(OS_TEST),alpha)
71
 
        OS_REL_CFLAGS   = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
 
62
        OS_REL_CFLAGS   = -D_ALPHA_
72
63
        CPU_ARCH        = alpha
73
64
else
74
 
ifeq ($(OS_TEST),ia64)
75
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
76
 
        CPU_ARCH        = ia64
77
 
else
78
65
ifeq ($(OS_TEST),x86_64)
79
66
ifeq ($(USE_64),1)
80
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
81
67
        CPU_ARCH        = x86_64
82
68
else
83
 
        OS_REL_CFLAGS   = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
 
69
        OS_REL_CFLAGS   = -Di386
84
70
        CPU_ARCH        = x86
85
71
        ARCHFLAG        = -m32
86
72
endif
87
73
else
88
 
ifeq ($(OS_TEST),sparc)
89
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
90
 
        CPU_ARCH        = sparc
91
 
else
92
74
ifeq ($(OS_TEST),sparc64)
93
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
94
75
        CPU_ARCH        = sparc
95
76
else
96
77
ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
97
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
98
78
        CPU_ARCH        = arm
99
79
else
100
 
ifeq ($(OS_TEST),parisc)
101
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
102
 
        CPU_ARCH        = hppa
103
 
else
104
 
ifeq ($(OS_TEST),parisc64)
105
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
106
 
        CPU_ARCH        = hppa
107
 
else
108
 
ifeq ($(OS_TEST),s390)
109
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
110
 
        CPU_ARCH        = s390
111
 
else
112
 
ifeq ($(OS_TEST),s390x)
113
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
114
 
        CPU_ARCH        = s390x
115
 
else
116
 
ifeq ($(OS_TEST),mips)
117
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
118
 
        CPU_ARCH        = mips
 
80
ifeq (,$(filter-out parisc%,$(OS_TEST)))
 
81
        CPU_ARCH        = hppa
119
82
else
120
83
ifeq (,$(filter-out i%86,$(OS_TEST)))
121
 
        OS_REL_CFLAGS   = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
 
84
        OS_REL_CFLAGS   = -Di386
122
85
        CPU_ARCH        = x86
123
86
else
124
 
        OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
 
87
ifeq ($(OS_TEST),sh4a)
 
88
        CPU_ARCH        = sh4
 
89
else
 
90
# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4
125
91
        CPU_ARCH        = $(OS_TEST)
126
92
endif
127
93
endif
131
97
endif
132
98
endif
133
99
endif
134
 
endif
135
 
endif
136
 
endif
137
 
endif
138
 
endif
139
 
endif
140
 
endif
141
100
 
142
101
 
143
102
LIBC_TAG                = _glibc
144
103
 
145
104
ifeq ($(OS_RELEASE),2.0)
146
105
        OS_REL_CFLAGS   += -DLINUX2_0
147
 
        MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
 
106
        MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
148
107
        ifdef MAPFILE
149
108
                MKSHLIB += -Wl,--version-script,$(MAPFILE)
150
109
        endif
158
117
else
159
118
        OPTIMIZER = -O2
160
119
endif
161
 
endif
 
120
ifdef MOZ_DEBUG_SYMBOLS
 
121
        OPTIMIZER  += -gstabs+
 
122
endif
 
123
endif
 
124
 
162
125
 
163
126
ifeq ($(USE_PTHREADS),1)
164
127
OS_PTHREAD = -lpthread 
165
128
endif
166
129
 
167
 
OS_CFLAGS               = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
 
130
# See bug 537829, in particular comment 23.
 
131
# Place -ansi and *_SOURCE before $(DSO_CFLAGS) so DSO_CFLAGS can override
 
132
# -ansi on platforms like Android where the system headers are C99 and do
 
133
# not build with -ansi.
 
134
STANDARDS_CFLAGS        = -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
 
135
OS_CFLAGS               = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
168
136
OS_LIBS                 = $(OS_PTHREAD) -ldl -lc
169
137
 
170
138
ifdef USE_PTHREADS
174
142
ARCH                    = linux
175
143
 
176
144
DSO_CFLAGS              = -fPIC
177
 
DSO_LDOPTS              = -shared $(ARCHFLAG) -Wl,-z,defs
178
 
DSO_LDFLAGS             =
 
145
DSO_LDOPTS              = -shared $(ARCHFLAG)
 
146
# The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
 
147
# incorrectly reports undefined references in the libraries we link with, so
 
148
# we don't use -z defs there.
 
149
ZDEFS_FLAG              = -Wl,-z,defs
 
150
DSO_LDOPTS              += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
179
151
LDFLAGS                 += $(ARCHFLAG)
180
152
 
181
153
# INCLUDES += -I/usr/include -Y/usr/include/linux
182
154
G++INCLUDES             = -I/usr/include/g++
183
155
 
184
156
#
185
 
# Always set CPU_TAG on Linux, OpenVMS, WINCE.
 
157
# Always set CPU_TAG on Linux, WINCE.
186
158
#
187
159
CPU_TAG = _$(CPU_ARCH)
188
160
 
189
161
USE_SYSTEM_ZLIB = 1
190
162
ZLIB_LIBS = -lz
 
163
 
 
164
# The -rpath '$$ORIGIN' linker option instructs this library to search for its
 
165
# dependencies in the same directory where it resides.
 
166
ifeq ($(BUILD_SUN_PKG), 1)
 
167
ifeq ($(USE_64), 1)
 
168
RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib64:/opt/sun/private/lib'
 
169
else
 
170
RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/private/lib'
 
171
endif
 
172
endif
 
173