Commit 55f31ee1 authored Jan 18, 2019 by J.C. Jones

Bug 1512719 - land NSS da45424cb9a0 UPGRADE_NSS_RELEASE, r=me

--HG--
extra : rebase_source : 982b8538e03e4e0c87d4354629dfbf5bbce3f918

parent 91b5d3d2

security/nss/TAG-INFO

+1 −1

Original line number	Original line	Diff line number	Diff line
	c8f7602ce9e6		da45424cb9a0

security/nss/automation/abi-check/expected-report-libnsssysinit.so.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
			Function symbols changes summary: 2 Removed, 0 Added function symbols not referenced by debug info
			Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referenced by debug info

			2 Removed function symbols not referenced by debug info:

			_fini
			_init

security/nss/coreconf/OS2.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,8 +39,6 @@ HIGHMEM_LDFLAG = -Zhigh-mem
	endif		endif

	ifndef NO_SHARED_LIB		ifndef NO_SHARED_LIB
	WRAP_MALLOC_LIB =
	WRAP_MALLOC_CFLAGS =
	DSO_CFLAGS =		DSO_CFLAGS =
	DSO_PIC_CFLAGS =		DSO_PIC_CFLAGS =
	MKSHLIB = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@		MKSHLIB = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@

security/nss/coreconf/coreconf.dep

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,3 +10,4 @@
	*/		*/

	#error "Do not include this header file."		#error "Do not include this header file."

security/nss/gtests/Makefile

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
	# (4) Include "local" platform-dependent assignments (OPTIONAL). #		# (4) Include "local" platform-dependent assignments (OPTIONAL). #
	#######################################################################		#######################################################################

			# Don't build sysinit gtests unless we are also building libnsssysinit.
			# See lib/Makefile for the corresponding rules.
			ifndef MOZILLA_CLIENT
			ifeq ($(OS_ARCH),Linux)
			ifneq ($(NSS_BUILD_UTIL_ONLY),1)
			SYSINIT_GTEST=sysinit_gtest
			endif
			endif
			endif


	#######################################################################		#######################################################################
	# (5) Execute "global" rules. (OPTIONAL) #		# (5) Execute "global" rules. (OPTIONAL) #