diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-12 19:26:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-13 18:27:25 +0100 |
| commit | d1299fd4c539a582e34c19e05ec635ee6ff6e0fa (patch) | |
| tree | 74af9f230e404adaf4d8c869f5bc38496ef09a1e /external | |
| parent | e59cc6448c525561cfef8ceb3f9c335b2a7611c0 (diff) | |
nss: remove obsolete signing-disabling patch
Obsolete since the Mac build uses NSS_USE_SYSTEM_SQLITE=1 now.
Change-Id: Ic02756c06a992d0f19849a4edf1e6305eafb8660
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/nss.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/external/nss/nss.patch b/external/nss/nss.patch index e2d7d7653308..841685b9c15a 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -199,27 +199,6 @@ endif endif endif ---- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 -+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 -@@ -78,10 +78,15 @@ - - # sign any and all shared libraries that contain the word freebl - --CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) --CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) -+# Signing causes loading of some system library which in turn loads -+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper -+# version. Therefore signing fails. -+# We cannot build with the system sqlite3, because it is too old (SDK -+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. -+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) -+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) - ifndef NSS_DISABLE_DBM --CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) -+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) - endif - CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) - --- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk +++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk @@ -64,12 +64,16 @@ |