Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 May 2023 05:30:06 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 515552b2d266 - main - net/nss_ldap: Fix LLVM15 build
Message-ID:  <202305100530.34A5U6HN001783@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=515552b2d2664dc02c2385519a7fedb855f46632

commit 515552b2d2664dc02c2385519a7fedb855f46632
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-05-10 05:22:14 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-05-10 05:29:55 +0000

    net/nss_ldap: Fix LLVM15 build
    
    ./configure's test for Heimdal results in,
    
    conftest.c:47:12: error: incompatible pointer to integer conversion initializing
     'const char' with an expression of type 'const char *'; dereference with * [-Wi
    nt-conversion]
    const char hv = heimdal_version;
               ^    ~~~~~~~~~~~~~~~
                    *
    
    This causes ./configure to erroneously assume 14-CURRENT uses MIT instead
    of Heimdal, resulting in a subsequent build failure because MIT's
    <profile.h> cannot be found.
    
    MFH:            2023Q3
---
 net/nss_ldap/files/patch-configure.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/nss_ldap/files/patch-configure.in b/net/nss_ldap/files/patch-configure.in
index bd6f78efe50e..223ab338eff2 100644
--- a/net/nss_ldap/files/patch-configure.in
+++ b/net/nss_ldap/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig
-+++ configure.in
+--- 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 @@
  linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;;
  *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;;
@@ -24,13 +24,14 @@
       AC_CHECK_HEADERS(irs.h) ;;
  esac
  AC_CHECK_HEADERS(thread.h)
-@@ -188,6 +191,13 @@
+@@ -188,6 +191,14 @@
  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>],
-+	    [const char hv = heimdal_version;],
++	    [char hv = heimdal_version;],
++	    [hv = hv;],
 +	    [AC_MSG_RESULT(yes)
 +	     AC_DEFINE(HEIMDAL,1,[Define if Kerberos is Heimdal])],
 +	    [AC_MSG_RESULT(no)])
@@ -38,7 +39,7 @@
  AC_CHECK_LIB(resolv, main)
  AC_CHECK_LIB(nsl, main)
  AC_CHECK_LIB(socket, main)
-@@ -230,7 +240,6 @@
+@@ -230,7 +241,6 @@
  AC_CHECK_FUNCS(gethostbyname)
  AC_CHECK_FUNCS(nsdispatch)
  AC_CHECK_LIB(pthread_nonshared, main)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305100530.34A5U6HN001783>