Bug 1605287 - Port bug 1594931: Stop compiling NSS' DBM legacy database in suite. r=frg
authorBill Gianopoulos <wgianopoulos@gmail.com>
Tue, 17 Dec 2019 07:02:40 -0500
changeset 37791 0873d221c55bdda55795f715ddca8898fd5e64a9
parent 37790 e2bc4de4ca67b44eddfaf6bdc60e3ae7bcd2fff2
child 37792 e28fbec27990d072b3e457f3d2e124cf1c9591fd
push id397
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:16:13 +0000
reviewersfrg
bugs1605287, 1594931
Bug 1605287 - Port bug 1594931: Stop compiling NSS' DBM legacy database in suite. r=frg
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -71,20 +71,16 @@ endif
 ifdef MOZ_IRC
 DEFINES += -DMOZ_IRC=1
 endif
 
 ifdef MOZ_DOMINSPECTOR
 DEFINES += -DMOZ_DOMINSPECTOR=1
 endif
 
-ifdef NSS_DISABLE_DBM
-DEFINES += -DNSS_DISABLE_DBM=1
-endif
-
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 ifdef MOZ_SYSTEM_NSPR
 DEFINES += -DMOZ_SYSTEM_NSPR=1
 endif
 
 ifdef MOZ_SYSTEM_NSS
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -365,19 +365,16 @@
 #ifndef MOZ_SYSTEM_NSS
 #if defined(XP_LINUX) && !defined(ANDROID)
 @BINPATH@/@DLL_PREFIX@freeblpriv3@DLL_SUFFIX@
 #else
 @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-#ifndef NSS_DISABLE_DBM
-@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
-#endif
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
 @RESPATH@/chrome/pippki@JAREXT@