From 7c687e56d9a0e55da3fd7dc66bea6d93d4f8e73b Mon Sep 17 00:00:00 2001 From: Moonchild Date: Mon, 13 Dec 2021 01:05:57 +0000 Subject: Never build with DBM --- basilisk/confvars.sh | 1 - basilisk/installer/Makefile.in | 4 ---- basilisk/installer/package-manifest.in | 3 --- platform | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh index b420cc4..01e364f 100644 --- a/basilisk/confvars.sh +++ b/basilisk/confvars.sh @@ -53,7 +53,6 @@ MOZ_SERVICES_HEALTHREPORT= MOZ_GAMEPAD=1 MOZ_AV1=1 MOZ_SECURITY_SQLSTORE=1 -NSS_DISABLE_DBM=1 if test "$OS_ARCH" = "WINNT" -o \ "$OS_ARCH" = "Darwin"; then diff --git a/basilisk/installer/Makefile.in b/basilisk/installer/Makefile.in index 0f27be7..db84bed 100644 --- a/basilisk/installer/Makefile.in +++ b/basilisk/installer/Makefile.in @@ -36,10 +36,6 @@ ifdef MOZ_SYSTEM_NSS DEFINES += -DMOZ_SYSTEM_NSS=1 endif -ifdef NSS_DISABLE_DBM -DEFINES += -DNSS_DISABLE_DBM=1 -endif - DEFINES += -DJAREXT= ifdef MOZ_ANGLE_RENDERER diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 8af679c..69c65cd 100644 --- a/basilisk/installer/package-manifest.in +++ b/basilisk/installer/package-manifest.in @@ -664,9 +664,6 @@ #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@ diff --git a/platform b/platform index 652171a..e27eb9a 160000 --- a/platform +++ b/platform @@ -1 +1 @@ -Subproject commit 652171acd5ad50037b1177ec92df82d1f2a5482a +Subproject commit e27eb9af0a353205c9583c15122f7e6fe17bca88 -- cgit v1.2.3