author | Rich Burridge <rich.burridge@oracle.com> |
Thu, 25 Aug 2016 14:58:58 -0700 | |
changeset 6687 | 30fa2b861fc3 |
permissions | -rw-r--r-- |
6687
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Needed to find the NSS/NSPR libraries at runtime. |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
These changes need to be sent upstream. |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- pidgin-2.11.0/configure.ac.orig 2016-08-25 12:38:53.201285451 +0000 |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ pidgin-2.11.0/configure.ac 2016-08-25 12:39:40.190394755 +0000 |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -2068,7 +2068,7 @@ |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
|
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
if test "x$ac_cv_moz_nspr_libs" != "xno"; then |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
have_nspr_libs="yes" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
- NSPR_LIBS="-L$with_nspr_libs $nsprlibs" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+ NSPR_LIBS="-L$with_nspr_libs $nsprlibs -R$with_nspr_libs" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
else |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
NSPR_CFLAGS="" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
enable_nss="no" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
@@ -2166,7 +2166,7 @@ |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
AC_DEFINE(HAVE_NSS) |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
AC_DEFINE(HAVE_SSL) |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
|
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
- NSS_LIBS="-L$with_nss_libs $nsslibs" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
+ NSS_LIBS="-L$with_nss_libs $nsslibs -R$with_nss_libs" |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
|
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
if test "$enable_nss" = "static"; then |
30fa2b861fc3
24523348 pidgin needs an extra RUNPATH to find NSS/NSPR libs
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
msg_nss="Mozilla NSS (static)" |