Bug 575620, remove obsolete patchfile from security/patches, no longer necessary with NSS 3.12.7
authorKai Engert <kaie@kuix.de>
Mon, 19 Jul 2010 08:14:19 +0200
changeset 47915 5a592c6451c305e35c8ae5b84cc0a19f403724b2
parent 47914 e15f9edaa78f4de7cde9c6d74b88ceacc2416524
child 47916 bafc956d254d3d99da6ebcb6557a3d010a21d442
push idunknown
push userunknown
push dateunknown
bugs575620
milestone2.0b2pre
Bug 575620, remove obsolete patchfile from security/patches, no longer necessary with NSS 3.12.7 Not part of the build
security/patches/README
security/patches/bug-519550.patch
--- a/security/patches/README
+++ b/security/patches/README
@@ -1,7 +1,2 @@
 This directory contains patches that were added locally
 on top of the NSS release.
-
-File: bug-519550.patch
-https://bugzilla.mozilla.org/show_bug.cgi?id=519550
-Changes NSS makefiles to link against Mozilla's sqlite library,
-which uses a different filename (prefixed by "moz").
deleted file mode 100644
--- a/security/patches/bug-519550.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up security/nss/cmd/platlibs.mk.pre519550 security/nss/cmd/platlibs.mk
---- security/nss/cmd/platlibs.mk.pre519550	2010-02-06 16:46:29.118236532 +0100
-+++ security/nss/cmd/platlibs.mk	2010-02-06 16:38:20.588959438 +0100
-@@ -110,6 +110,7 @@ PKIXLIB = \
- 
- # can't do this in manifest.mn because OS_ARCH isn't defined there.
- ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) 
-+SQLITE = $(LIB_PREFIX)sqlite3.$(LIB_SUFFIX)
- 
- EXTRA_LIBS += \
- 	$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
-@@ -130,7 +131,7 @@ EXTRA_LIBS += \
- 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
- 	$(PKIXLIB) \
- 	$(DBMLIB) \
--	$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
-+	$(DIST)/lib/$(SQLITE) \
- 	$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
- 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
-diff -up security/nss/lib/softoken/config.mk.pre519550 security/nss/lib/softoken/config.mk
---- security/nss/lib/softoken/config.mk.pre519550	2010-02-06 16:46:44.701986018 +0100
-+++ security/nss/lib/softoken/config.mk	2010-02-06 16:51:10.634999945 +0100
-@@ -53,11 +53,12 @@ RES = $(OBJDIR)/$(LIBRARY_NAME).res
- RESNAME = $(LIBRARY_NAME).rc
- 
- ifdef NS_USE_GCC
-+SQLITE = -lsqlite3
- EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib \
- 	-L$(NSSUTIL_LIB_DIR) \
- 	-lnssutil3 \
--	-lsqlite3 \
-+	$(SQLITE) \
- 	-L$(NSPR_LIB_DIR) \
- 	-lplc4 \
- 	-lplds4 \
-@@ -65,8 +66,9 @@ EXTRA_SHARED_LIBS += \
- 	$(NULL)
- else # ! NS_USE_GCC
- 
-+SQLITE = sqlite3.lib
- EXTRA_SHARED_LIBS += \
--	$(DIST)/lib/sqlite3.lib \
-+	$(DIST)/lib/$(SQLITE) \
- 	$(DIST)/lib/nssutil3.lib \
- 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
- 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
-@@ -79,11 +81,12 @@ else
- 
- # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
- # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
-+SQLITE = -lsqlite3
- EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib \
- 	-L$(NSSUTIL_LIB_DIR) \
- 	-lnssutil3 \
--	-lsqlite3 \
-+	$(SQLITE) \
- 	-L$(NSPR_LIB_DIR) \
- 	-lplc4 \
- 	-lplds4 \