no-crmf.diff 1014 B

12345678910111213141516171819202122232425262728
  1. diff --git i/old-configure.in w/old-configure.in
  2. index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
  3. --- i/old-configure.in
  4. +++ w/old-configure.in
  5. @@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
  6. AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
  7. fi
  8. -if test -n "$MOZ_SYSTEM_NSS"; then
  9. - NSS_LIBS="$NSS_LIBS -lcrmf"
  10. -else
  11. +if test -z "$MOZ_SYSTEM_NSS"; then
  12. NSS_CFLAGS="-I${DIST}/include/nss"
  13. case "${OS_ARCH}" in
  14. # Only few platforms have been tested with GYP
  15. diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
  16. index 9b8005f..4bfcc81 100644
  17. --- a/config/external/nss/crmf/moz.build
  18. +++ b/config/external/nss/crmf/moz.build
  19. @@ -8,7 +8,6 @@ Library('crmf')
  20. if CONFIG['MOZ_NATIVE_NSS']:
  21. OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
  22. - OS_LIBS += ['-lcrmf']
  23. else:
  24. USE_LIBS += [
  25. # The dependency on nss is not real, but is required to force the