diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-17 14:46:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-17 14:47:51 +0100 |
| commit | e80a6eb111da4a258286715ac27a5c10cb2ce07d (patch) | |
| tree | 56b0472d4671f4b2d4f69093d6c44230066745ca /openldap | |
| parent | 39ea1402d8be477a4d9645c368e9bbc680e91cc8 (diff) | |
NSS_Initialize is actually in nssutil3
so add in all the libs we're going to link against when doing our link test,
which fixes the build for this on an old debian toolchain.
Change-Id: Ia2883f0992ad44e3857576eee59c70df80028694
Diffstat (limited to 'openldap')
| -rw-r--r-- | openldap/openldap-2.4.31.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/openldap/openldap-2.4.31.patch b/openldap/openldap-2.4.31.patch index fa4803d36f2c..656a2c9ebd2d 100644 --- a/openldap/openldap-2.4.31.patch +++ b/openldap/openldap-2.4.31.patch @@ -48,3 +48,26 @@ #undef NSS_VERSION_INT #define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \ +--- misc/openldap-2.4.31/configure.in 2012-04-22 21:25:08.000000000 +0100 ++++ misc/build/openldap-2.4.31/configure.in 2012-07-16 13:56:24.000000000 +0100 +@@ -1232,7 +1232,8 @@ + AC_CHECK_HEADERS([nssutil.h]) + if test "$ac_cv_header_nssutil_h" = yes ; then + AC_CHECK_LIB([nss3], [NSS_Initialize], +- [ have_moznss=yes ], [ have_moznss=no ]) ++ [ have_moznss=yes ], [ have_moznss=no ], ++ [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ]) + fi + + if test "$have_moznss" = yes ; then +--- misc/openldap-2.4.31/configure 2012-07-16 14:11:55.000000000 +0100 ++++ misc/build/openldap-2.4.31/configure 2012-07-16 13:56:24.000000000 +0100 +@@ -15718,7 +15718,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnss3 $LIBS" ++LIBS="-lnss3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + |