From: OpenJDK Team <openjdk@lists.launchpad.net>
Date: Fri, 11 Nov 2016 12:21:51 +0000 (+0000)
Subject: it-nss-softokn-config
X-Git-Tag: archive/raspbian/7u121-2.6.8-2_deb8u1+rpi1~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1350452dbcf5cc2f8ea9c2dc53c933cf865a3963;p=openjdk-7.git

it-nss-softokn-config

# DP: Fix configure check for the SunEC security provider.


Gbp-Pq: Name it-nss-softokn-config.diff
---

diff --git a/acinclude.m4 b/acinclude.m4
index b1d4692..3b8ba16 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2791,9 +2791,12 @@ AC_DEFUN_ONCE([IT_ENABLE_SUNEC],
   if test x"${ENABLE_SUNEC}" = "xyes"; then
     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])
+    NSS_SOFTOKN_FOUND=yes
+    NSS_SOFTOKN_CFLAGS=$NSS_CFLAGS
     if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+      nsslibdir="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/nss"
       SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
-      SUNEC_LIBS="$NSS_LIBS -lfreebl";
+      SUNEC_LIBS="$NSS_LIBS -L$nsslibdir -Xlinker -rpath=$nsslibdir -lfreebl3";
     elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
       SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
       SUNEC_LIBS=$NSS_JAVA_LIBS;