Mercurial > hg > release > icedtea7-2.6
changeset 2716:7ae2b1ac339d
PR1762: Undefined references when building with NSS 3.16.1
2014-05-09 Andrew John Hughes <gnu.andrew@member.fsf.org>
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl
to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as
the base, not NSS_SOFTOKN_LIBS.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Fri, 09 May 2014 20:34:40 +0100 |
parents | 4f67c07197c3 |
children | b7bc434d2b61 |
files | ChangeLog NEWS acinclude.m4 |
diffstat | 3 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 09 16:36:34 2014 +0100 +++ b/ChangeLog Fri May 09 20:34:40 2014 +0100 @@ -1,3 +1,12 @@ +2014-05-09 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1762: Undefined references when building with NSS 3.16.1 + * NEWS: Updated. + * acinclude.m4: + (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl + to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as + the base, not NSS_SOFTOKN_LIBS. + 2014-05-09 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am:
--- a/NEWS Fri May 09 16:36:34 2014 +0100 +++ b/NEWS Fri May 09 20:34:40 2014 +0100 @@ -181,6 +181,7 @@ - PR1758: Support PPC64 JIT on ppc64le - PR1757: register_method usage in sharkCompiler.cpp needs to be adjusted following S7196199 - Correct placement of S8041658 fix + - PR1762: Undefined references when building with NSS 3.16.1 New in release 2.5.0 (2014-XX-XX):
--- a/acinclude.m4 Fri May 09 16:36:34 2014 +0100 +++ b/acinclude.m4 Fri May 09 20:34:40 2014 +0100 @@ -2730,8 +2730,8 @@ PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no]) PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no]) if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then - SUNEC_CFLAGS="$NSS_SOFTOKN_CFLAGS -lfreebl"; - SUNEC_LIBS=$NSS_SOFTOKN_LIBS; + SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS; + SUNEC_LIBS="$NSS_LIBS -lfreebl"; elif test "x${NSS_JAVA_FOUND}" = "xyes"; then SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS"; SUNEC_LIBS=$NSS_JAVA_LIBS;