Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Oct 2021 06:45:43 GMT
From:      Xin LI <delphij@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 018803104cba - main - net/openldap24-client: Install libldap as symlinks to libldap_r.
Message-ID:  <202110250645.19P6jhKH025197@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=018803104cbab00fd901d80ca2829191d7287a28

commit 018803104cbab00fd901d80ca2829191d7287a28
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2021-10-25 06:09:48 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2021-10-25 06:45:37 +0000

    net/openldap24-client: Install libldap as symlinks to libldap_r.
    
    As of FreeBSD 12.0, OpenSSL is depending on the threading library
    and it is no longer possible to build a true non-threaded version
    of libldap.
    
    The libldap_r is ABI compatible with libldap and is shipped as the
    libldap on Solaris and many Linux distributions, so follow the same
    approach.
---
 net/openldap24-server/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 55186932c24c..08572e8bc96f 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -49,7 +49,7 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	3
+PORTREVISION_CLIENT=	4
 PORTREVISION_SERVER=	6
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	11.7
@@ -622,9 +622,12 @@ post-install:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
 	done
 
-	for library in lber ldap ldap_r; do \
+	for library in lber ldap_r; do \
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
+	for suffix in -${OPENLDAP_MAJOR}.so.2 -${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}.${OPENLDAP_SHLIB_MINOR} .a .la .so; do \
+		${LN} -sf libldap_r$${suffix} ${STAGEDIR}${PREFIX}/lib/libldap$${suffix}; \
+	done
 .else
 	${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
 .for module in ${CONTRIB_MODULES}



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