Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-shared-nss-db.patch
changeset 585 5a44d417c9b5
parent 568 2c74c5927ea2
child 596 9124c1a643c5 
--- a/mozilla-shared-nss-db.patch	Mon Nov 19 14:25:17 2012 +0100
+++ b/mozilla-shared-nss-db.patch	Wed Nov 21 19:04:48 2012 +0100
@@ -7,7 +7,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8089,16 +8089,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8099,16 +8099,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -42,20 +42,18 @@
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -91,12 +91,14 @@ DEFINES += \
+@@ -90,10 +90,13 @@ DEFINES += \
+   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
+   $(NULL)
  
  EXPORTS += \
    nsNSSShutDown.h \
    ScopedNSSTypes.h \
    $(NULL)
  
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
++LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
++EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
 +
-+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
- 
  include $(topsrcdir)/config/rules.mk
  
 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
mozilla