Magellan Linux

Annotation of /trunk/mozilla-thunderbird/patches/mozilla-thunderbird-2.0.0.23-nss-3.12-asneeded.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 923 - (hide annotations) (download)
Tue Nov 3 21:55:05 2009 UTC (14 years, 7 months ago) by niro
File size: 1006 byte(s)
-fixes for 2.0.0.23-r1

1 niro 923 # Fix a FTBFS with system libnss (caused by bad linking order with libcrmf)
2     # by Fabien Tassin <fta@sofaraway.org>
3    
4     Index: seamonkey-1.1.4/configure.in
5     ===================================================================
6     --- seamonkey-1.1.4.orig/configure.in
7     +++ seamonkey-1.1.4/configure.in
8     @@ -3735,17 +3735,17 @@
9     [ --with-system-nss Use system installed NSS],
10     _USE_SYSTEM_NSS=1 )
11    
12     if test -n "$_USE_SYSTEM_NSS"; then
13     AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
14     fi
15    
16     if test -n "$MOZ_NATIVE_NSS"; then
17     - NSS_LIBS="$NSS_LIBS -lcrmf"
18     + NSS_LIBS=" -lcrmf $NSS_LIBS"
19     else
20     NSS_CFLAGS='-I$(DIST)/public/nss'
21     NSS_DEP_LIBS='\\\
22     $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \\\
23     $(DIST)/lib/$(DLL_PREFIX)smime'$NSS_VERSION'$(DLL_SUFFIX) \\\
24     $(DIST)/lib/$(DLL_PREFIX)ssl'$NSS_VERSION'$(DLL_SUFFIX) \\\
25     $(DIST)/lib/$(DLL_PREFIX)nss'$NSS_VERSION'$(DLL_SUFFIX) \\\
26     $(DIST)/lib/$(DLL_PREFIX)softokn'$NSS_VERSION'$(DLL_SUFFIX)'
27