diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-03-16 09:24:52 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-03-16 09:26:12 +0100 |
| commit | 12bf3efae5ed83cf1cdd5758521c4a80100183b8 (patch) | |
| tree | af19624ec9fe99b540ecb6c5453aa036ed171644 /libre/icecat/no-crmf.diff | |
| parent | 95b66a84882efd434133fe9995482536146ac071 (diff) | |
| download | abslibre-12bf3efae5ed83cf1cdd5758521c4a80100183b8.tar.gz abslibre-12bf3efae5ed83cf1cdd5758521c4a80100183b8.tar.bz2 abslibre-12bf3efae5ed83cf1cdd5758521c4a80100183b8.zip | |
libre/icecat: updated to 52.6.0_gnu1
Diffstat (limited to 'libre/icecat/no-crmf.diff')
| -rw-r--r-- | libre/icecat/no-crmf.diff | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libre/icecat/no-crmf.diff b/libre/icecat/no-crmf.diff index 3edb053ef..0d9d46590 100644 --- a/libre/icecat/no-crmf.diff +++ b/libre/icecat/no-crmf.diff @@ -2,8 +2,8 @@ diff --git i/old-configure.in w/old-configure.in index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 --- i/old-configure.in +++ w/old-configure.in -@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +@@ -2126,9 +2126,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi -if test -n "$MOZ_SYSTEM_NSS"; then @@ -11,15 +11,15 @@ index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 -else +if test -z "$MOZ_SYSTEM_NSS"; then NSS_CFLAGS="-I${DIST}/include/nss" - case "${OS_ARCH}" in - # Only few platforms have been tested with GYP + fi + diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build index 9b8005f..4bfcc81 100644 --- a/config/external/nss/crmf/moz.build +++ b/config/external/nss/crmf/moz.build @@ -8,7 +8,6 @@ Library('crmf') - if CONFIG['MOZ_NATIVE_NSS']: + if CONFIG['MOZ_SYSTEM_NSS']: OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')] - OS_LIBS += ['-lcrmf'] else: |