CVS commit: pkgsrc/databases/openldap-client

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Jul 15 12:28:08 UTC 2024

Modified Files:
        pkgsrc/databases/openldap-client: Makefile options.mk

Log Message:
Apparently, --without-cyrus-sasl does not remove the related symbols
from the linker map libraries/libldap/ldap.map, which FreeBSD's clang
linker (potentially others?) objects to.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/databases/openldap-client/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/openldap-client/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/openldap-client/Makefile
diff -u pkgsrc/databases/openldap-client/Makefile:1.33 pkgsrc/databases/openldap-client/Makefile:1.34
--- pkgsrc/databases/openldap-client/Makefile:1.33      Wed Jan 31 18:17:21 2024
+++ pkgsrc/databases/openldap-client/Makefile   Mon Jul 15 12:28:08 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2024/01/31 18:17:21 adam Exp $
+# $NetBSD: Makefile,v 1.34 2024/07/15 12:28:08 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
+PKGREVISION=   1
 COMMENT=       Lightweight Directory Access Protocol libraries and client programs
 
 CONFLICTS+=            openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-client/options.mk
diff -u pkgsrc/databases/openldap-client/options.mk:1.3 pkgsrc/databases/openldap-client/options.mk:1.4
--- pkgsrc/databases/openldap-client/options.mk:1.3     Mon Aug 23 09:58:58 2021
+++ pkgsrc/databases/openldap-client/options.mk Mon Jul 15 12:28:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2021/08/23 09:58:58 adam Exp $
+# $NetBSD: options.mk,v 1.4 2024/07/15 12:28:08 hauke Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-client
 PKG_SUPPORTED_OPTIONS= kerberos sasl slp inet6
@@ -24,6 +24,14 @@ BUILDLINK_API_DEPENDS.cyrus-sasl+=   cyrus
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-cyrus-sasl
+
+# FreeBSD clang linker trips over undefined symbols
+SUBST_CLASSES.FreeBSD+=        linksym
+SUBST_STAGE.linksym=   pre-configure
+SUBST_FILES.linksym=   libraries/libldap/ldap.map
+SUBST_SED.linksym=     -E -e '/ldap_(int|pvt)_sasl_.+;/d'
+SUBST_SED.linksym+=    -e '/ldap_host_connected_to;/d'
+SUBST_MESSAGE.linksym= Fixing missing symbols linker error.
 .endif
 
 ###