Annotation of /trunk/nss/patches/nss-3.12.4-no-local-sql.patch
Parent Directory | Revision Log
Revision 922 -
(hide annotations)
(download)
Tue Nov 3 20:57:48 2009 UTC (14 years, 10 months ago) by niro
File size: 2152 byte(s)
Tue Nov 3 20:57:48 2009 UTC (14 years, 10 months ago) by niro
File size: 2152 byte(s)
patch
1 | niro | 922 | diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile |
2 | --- mozilla/security/nss/lib/Makefile.nolocalsql 2007-11-06 15:12:37.000000000 +0100 | ||
3 | +++ mozilla/security/nss/lib/Makefile 2007-11-06 15:13:35.000000000 +0100 | ||
4 | @@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE) | ||
5 | DIRS := $(filter-out fortcrypt,$(DIRS)) | ||
6 | endif | ||
7 | |||
8 | -ifndef MOZILLA_CLIENT | ||
9 | -ifndef NSS_USE_SYSTEM_SQLITE | ||
10 | -DIRS := sqlite $(DIRS) | ||
11 | -endif | ||
12 | -endif | ||
13 | +#ifndef MOZILLA_CLIENT | ||
14 | +#ifndef NSS_USE_SYSTEM_SQLITE | ||
15 | +#DIRS := sqlite $(DIRS) | ||
16 | +#endif | ||
17 | +#endif | ||
18 | |||
19 | ####################################################################### | ||
20 | # (5) Execute "global" rules. (OPTIONAL) # | ||
21 | diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn | ||
22 | --- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2007-11-06 15:10:59.000000000 +0100 | ||
23 | +++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2007-11-06 15:11:07.000000000 +0100 | ||
24 | @@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def | ||
25 | |||
26 | DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" | ||
27 | |||
28 | -ifdef MOZILLA_CLIENT | ||
29 | -INCLUDES += -I$(DIST)/include/sqlite3 | ||
30 | -endif | ||
31 | +#ifdef MOZILLA_CLIENT | ||
32 | +#INCLUDES += -I$(DIST)/include/sqlite3 | ||
33 | +#endif | ||
34 | |||
35 | CSRCS = \ | ||
36 | dbmshim.c \ | ||
37 | diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn | ||
38 | --- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2007-11-06 15:08:14.000000000 +0100 | ||
39 | +++ mozilla/security/nss/lib/softoken/manifest.mn 2007-11-06 15:10:21.000000000 +0100 | ||
40 | @@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def | ||
41 | |||
42 | DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" | ||
43 | |||
44 | -ifdef MOZILLA_CLIENT | ||
45 | -INCLUDES += -I$(DIST)/include/sqlite3 | ||
46 | -endif | ||
47 | +#ifdef MOZILLA_CLIENT | ||
48 | +#INCLUDES += -I$(DIST)/include/sqlite3 | ||
49 | +#endif | ||
50 | |||
51 | EXPORTS = \ | ||
52 | pkcs11.h \ | ||
53 | diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk |