5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -8193,16 +8193,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -8192,16 +8192,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 MOZ_ENABLE_SKIA_GPU=1 |
11 MOZ_ENABLE_SKIA_GPU=1 |
12 AC_DEFINE(USE_SKIA_GPU) |
12 AC_DEFINE(USE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
13 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
14 fi |
14 fi |
15 fi |
15 fi |
77 #include "NSSCertDBTrustDomain.h" |
77 #include "NSSCertDBTrustDomain.h" |
78 #include "mozilla/Telemetry.h" |
78 #include "mozilla/Telemetry.h" |
79 #include "nsCertVerificationThread.h" |
79 #include "nsCertVerificationThread.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
80 #include "nsAppDirectoryServiceDefs.h" |
81 #include "nsComponentManagerUtils.h" |
81 #include "nsComponentManagerUtils.h" |
82 @@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS() |
82 @@ -944,17 +951,31 @@ nsNSSComponent::InitializeNSS() |
83 if (NS_FAILED(rv)) { |
83 if (NS_FAILED(rv)) { |
84 nsPSMInitPanic::SetPanic(); |
84 nsPSMInitPanic::SetPanic(); |
85 return NS_ERROR_NOT_AVAILABLE; |
85 return NS_ERROR_NOT_AVAILABLE; |
86 } |
86 } |
87 |
87 |
113 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
113 PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
114 } |
114 } |
115 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk |
115 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk |
116 --- a/toolkit/library/libxul.mk |
116 --- a/toolkit/library/libxul.mk |
117 +++ b/toolkit/library/libxul.mk |
117 +++ b/toolkit/library/libxul.mk |
118 @@ -145,17 +145,17 @@ endif |
118 @@ -32,16 +32,18 @@ endif |
119 ifdef MOZ_WMF |
119 ifeq (Linux,$(OS_ARCH)) |
120 OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids) |
120 # Create a GDB Python auto-load file alongside the libxul shared library in |
|
121 # the build directory. |
|
122 PP_TARGETS += LIBXUL_AUTOLOAD |
|
123 LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in |
|
124 LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) |
121 endif |
125 endif |
122 |
126 |
123 ifdef MOZ_DIRECTSHOW |
127 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
124 OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) |
128 + |
125 endif |
129 # BFD ld doesn't create multiple PT_LOADs as usual when an unknown section |
126 |
130 # exists. Using an implicit linker script to make it fold that section in |
127 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
131 # .data.rel.ro makes it create multiple PT_LOADs. That implicit linker |
128 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
132 # script however makes gold misbehave, first because it doesn't like that |
129 |
133 # the linker script is given after crtbegin.o, and even past that, replaces |
130 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
134 # the default section rules with those from the script instead of |
131 OS_LIBS += \ |
135 # supplementing them. Which leads to a lib with a huge load of sections. |
132 $(TK_LIBS) \ |
136 ifneq (OpenBSD,$(OS_TARGET)) |
133 $(NULL) |
|
134 endif |
|
135 |
|
136 ifeq (OpenBSD,$(OS_ARCH)) |
|