wok-current view nss/stuff/nss-nolocalsql.patch @ rev 11037
slock: Clean up.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Sun Oct 16 07:26:33 2011 +0000 (2011-10-16) |
| parents | |
| children |
line source
1 diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
2 --- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800
3 +++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800
4 @@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB
5 ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS.
6 endif
8 -ifndef MOZILLA_CLIENT
9 -ifndef NSS_USE_SYSTEM_SQLITE
10 -SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS.
11 -endif
12 -endif
13 +#ifndef MOZILLA_CLIENT
14 +#ifndef NSS_USE_SYSTEM_SQLITE
15 +#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS.
16 +#endif
17 +#endif
19 ifndef MOZILLA_CLIENT
20 ifeq ($(OS_ARCH),Linux)
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 2010-02-27 16:44:24.998777709 -0800
23 +++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800
24 @@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
26 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
28 -ifdef MOZILLA_CLIENT
29 -INCLUDES += -I$(DIST)/include/sqlite3
30 -endif
31 +#ifdef MOZILLA_CLIENT
32 +#INCLUDES += -I$(DIST)/include/sqlite3
33 +#endif
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 2010-02-27 16:42:52.213902231 -0800
39 +++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800
40 @@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
42 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
44 -ifdef MOZILLA_CLIENT
45 -INCLUDES += -I$(DIST)/include/sqlite3
46 -endif
47 +#ifdef MOZILLA_CLIENT
48 +#INCLUDES += -I$(DIST)/include/sqlite3
49 +#endif
51 EXPORTS = \
52 secmodt.h \