1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-09 06:51:44 +00:00

net/nss_ldap: fix the build on both 13.2 and 14.0+

The original configure script attempted to detect the presence of
Heimdal, but it failed with LLVM 15+ due to a type casting bug.
commit 515552b2d2 fixed the bug with
LLVM 15+, but inadvertently broke the build for earlier versions.

This commit corrects the configure syntax, fixing the build on 12.4 and
13.2.

PR:		270465
Approved by:	mikael (ports)
Sponsored by:	Axcient
MFH:		2023Q4
This commit is contained in:
Alan Somers 2023-11-21 10:03:38 -07:00
parent 0a370eec38
commit 512a940c48

View File

@ -1,6 +1,6 @@
--- configure.in.orig 2009-11-06 02:28:08.000000000 -0800
+++ configure.in 2023-05-09 21:54:34.360457000 -0700
@@ -97,11 +97,15 @@
--- configure.in.orig 2009-11-06 10:28:08 UTC
+++ configure.in
@@ -97,11 +97,15 @@ esac
linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;;
*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;;
esac
@ -16,7 +16,7 @@
AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD")
@@ -153,7 +157,6 @@
@@ -153,7 +157,6 @@ case "$target_os" in
aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;;
hpux*) AC_CHECK_HEADERS(nsswitch.h) ;;
*) AC_CHECK_HEADERS(nss.h)
@ -24,14 +24,13 @@
AC_CHECK_HEADERS(irs.h) ;;
esac
AC_CHECK_HEADERS(thread.h)
@@ -188,6 +191,14 @@
@@ -188,6 +191,13 @@ AC_CHECK_HEADERS(krb5.h)
AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)
AC_CHECK_HEADERS(krb5.h)
+AC_MSG_CHECKING([if Kerberos is Heimdal])
+AC_TRY_LINK([#include <krb5.h>],
+ [char hv = heimdal_version;],
+ [hv = hv;],
+ [const char *hv = heimdal_version;],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HEIMDAL,1,[Define if Kerberos is Heimdal])],
+ [AC_MSG_RESULT(no)])
@ -39,7 +38,7 @@
AC_CHECK_LIB(resolv, main)
AC_CHECK_LIB(nsl, main)
AC_CHECK_LIB(socket, main)
@@ -230,7 +241,6 @@
@@ -230,7 +240,6 @@ AC_CHECK_LIB(pthread_nonshared, main)
AC_CHECK_FUNCS(gethostbyname)
AC_CHECK_FUNCS(nsdispatch)
AC_CHECK_LIB(pthread_nonshared, main)