Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jb36034' into 'master'
[build] Revert previous change as NSS is no longer in the critical build path. JB#36034 See merge request mer-core/nss!11
- Loading branch information
Showing
4 changed files
with
45 additions
and
96 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- nss/lib/Makefile 2010/11/16 13:55:53 1.1 | ||
+++ nss/lib/Makefile 2010/11/16 13:57:29 | ||
@@ -62,11 +62,11 @@ | ||
ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. | ||
endif | ||
|
||
-ifndef MOZILLA_CLIENT | ||
-ifndef NSS_USE_SYSTEM_SQLITE | ||
-SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. | ||
-endif | ||
-endif | ||
+#ifndef MOZILLA_CLIENT | ||
+#ifndef NSS_USE_SYSTEM_SQLITE | ||
+#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. | ||
+#endif | ||
+#endif | ||
|
||
ifndef MOZILLA_CLIENT | ||
ifeq ($(OS_ARCH),Linux) | ||
--- nss/lib/softoken/manifest.mn 2010/11/16 13:56:14 1.1 | ||
+++ nss/lib/softoken/manifest.mn 2010/11/16 13:58:24 | ||
@@ -47,9 +47,9 @@ | ||
|
||
DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" | ||
|
||
-ifdef SQLITE_INCLUDE_DIR | ||
-INCLUDES += -I$(SQLITE_INCLUDE_DIR) | ||
-endif | ||
+#ifdef SQLITE_INCLUDE_DIR | ||
+#INCLUDES += -I$(SQLITE_INCLUDE_DIR) | ||
+#endif | ||
|
||
EXPORTS = \ | ||
secmodt.h \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters