Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 575620, remove obsolete patchfile from security/patches, no longer necessary with NSS 3.12.7

Browse Source 
Not part of the build
This commit is contained in:
Kai Engert 2010-07-19 08:14:19 +02:00
parent cc876aa6b9
commit ecc96b655c
2 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/patches/README
View File

@ -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").

62
security/patches/bug-519550.patch
View File

@ -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 \