/hg/icedtea7: PR1762: Undefined references when building with NS...

[andrew at icedtea.classpath.org]

changeset 7ae2b1ac339d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=7ae2b1ac339d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri May 09 20:34:40 2014 +0100

	PR1762: Undefined references when building with NSS 3.16.1

	2014-05-09  Andrew John Hughes  <gnu.andrew at 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.


diffstat:

 ChangeLog    |  9 +++++++++
 NEWS         |  1 +
 acinclude.m4 |  4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 4f67c07197c3 -r 7ae2b1ac339d ChangeLog
--- 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 at 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 at member.fsf.org>
 
 	* Makefile.am:
diff -r 4f67c07197c3 -r 7ae2b1ac339d NEWS
--- 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):
 
diff -r 4f67c07197c3 -r 7ae2b1ac339d acinclude.m4
--- 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;