CVS commit: pkgsrc/databases/openldap-server

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Jul 15 12:30:57 UTC 2024

Modified Files:
        pkgsrc/databases/openldap-server: 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.73 -r1.74 pkgsrc/databases/openldap-server/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/openldap-server/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-server/Makefile
diff -u pkgsrc/databases/openldap-server/Makefile:1.73 pkgsrc/databases/openldap-server/Makefile:1.74
--- pkgsrc/databases/openldap-server/Makefile:1.73      Wed Jan 31 18:17:22 2024
+++ pkgsrc/databases/openldap-server/Makefile   Mon Jul 15 12:30:57 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2024/01/31 18:17:22 adam Exp $
+# $NetBSD: Makefile,v 1.74 2024/07/15 12:30:57 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
+PKGREVISION=   1
 COMMENT=       Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=    openldap<2.3.23nb1

Index: pkgsrc/databases/openldap-server/options.mk
diff -u pkgsrc/databases/openldap-server/options.mk:1.25 pkgsrc/databases/openldap-server/options.mk:1.26
--- pkgsrc/databases/openldap-server/options.mk:1.25    Mon Aug 23 09:58:59 2021
+++ pkgsrc/databases/openldap-server/options.mk Mon Jul 15 12:30:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2021/08/23 09:58:59 adam Exp $
+# $NetBSD: options.mk,v 1.26 2024/07/15 12:30:57 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS=         dso inet6 sasl slapi slp
@@ -41,6 +41,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
 
 ###