From nobody Sat Mar 09 21:42:04 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tsc246BNMz5F0ds; Sat, 9 Mar 2024 21:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tsc245grrz4cVS; Sat, 9 Mar 2024 21:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710020524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ikqeu5aVs+3KjNIxo5PHpdww+lIAlWd4PWsFc219XuE=; b=dvQuXKXH5oIaYDLIwQsa7TI4x2q7r632/rfEQomDHtQFRV/AiIOfM1rGFSz5T+1IvY/ODN pJJ4lWgBSIw9kyN14eS2AZlxBKTkEG9wxW0ABndYjVLFBSIro4awu7QCqtRkjH4dJNr7qG Wq0Rufg9YZPrc7dqeZfG6mtG1ipFFImIBSDAQLHszlof4SILqOeKTJXTFQ/zUv9f8R5eSJ x0DOuW4or6uid9mQ/c/9WytT1r2wOF4yUQtT8Yxnvn+eXyCbYKo7js7AH2Gl5Zk2rF97aX UcGShMCodAAzyjZPmb2BaLPcNvTq1ySgNZBtIbKL4IwPifn2qs0HDDa61ofhrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710020524; a=rsa-sha256; cv=none; b=C2R5Zb1Vgld20uxxKm/SI/SK54LNvsKsaS84kMoualSSkkakK6CXVncgsCAmuIwsZfOEPX 15OszhzvrA7+F3+2FRgA1XYfZ9IeVYW7HsUAT49FoitIn/XqyhNjMbFSSkVOvyr+J7Sr/H 38I93mvlUU++9FFYDeXFZ3DStAMjL+maLzt33H5g/bddAOpf6klTzzWSjZxK86zxcFnC2N vwBZNzybUXkn9QBhIhoX9ITrnJrSPXzQFY1De8c7Fz7dFMqBmBe+pql29H8LFc5EOGdyT1 E7OCLFjYHwegUwZ0JKyI+NVM5ronFrzPtfs8K2darlD5YWRUH/5A+Jrk9aZDuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710020524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ikqeu5aVs+3KjNIxo5PHpdww+lIAlWd4PWsFc219XuE=; b=ZqaedR/36rZof+6gbIWH//WxkqOTwt01vx9jA0jL/4mpgPnS9h61gOU55KKYpnovLqDa6p +DEL5CuT6yKwHHCc4RxHgjvX707alVJYbfFh0moyZkiE99zACqY6YJw3hfIZI/ppexR84N O/XSWwFnvF4GkY4wbCCipFjzVBsoZ2tCiJ7YfsLfuBxmemkKsXY3BNN9pSwQRA+hHiHJo0 EM9pobkso1kYaNUSjS5y3Xs42gCq2LFFOG6vi8/YiejCBD3sM+CtJ0aLzKurqdAW+A8wA/ 5NSZ8OLiGkuPE2G5bbQni9sijdal6J2hBMs+PP8V70RcauQtsG7wspjD0NXCtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tsc245HNJzJVY; Sat, 9 Mar 2024 21:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429Lg4Pt092652; Sat, 9 Mar 2024 21:42:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429Lg4RQ092649; Sat, 9 Mar 2024 21:42:04 GMT (envelope-from git) Date: Sat, 9 Mar 2024 21:42:04 GMT Message-Id: <202403092142.429Lg4RQ092649@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Xin LI Subject: git: c03c94943e1d - 2024Q1 - net/openldap26-server: fix build with lld 17 and DEBUG option off List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: c03c94943e1de2751f21e6dd264538f0402df6b2 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=c03c94943e1de2751f21e6dd264538f0402df6b2 commit c03c94943e1de2751f21e6dd264538f0402df6b2 Author: Dimitry Andric AuthorDate: 2024-03-09 21:37:15 +0000 Commit: Xin LI CommitDate: 2024-03-09 21:41:37 +0000 net/openldap26-server: fix build with lld 17 and DEBUG option off If the DEBUG option for the net/openldap26-server is turned off, building the port will result in: ld: error: version script assignment of 'OPENLDAP_2.200' to symbol 'ldap_dump_connection' failed: symbol not defined ld: error: version script assignment of 'OPENLDAP_2.200' to symbol 'ldap_dump_requests_and_responses' failed: symbol not defined cc: error: linker command failed with exit code 1 (use -v to see invocation) This is because the mentioned symbols are in a #ifdef LDAP_DEBUG block, and will indeed not be defined if DEBUG option is off. Adjust the port Makefile to delete the undefined symbols from the ldap.map file, if the DEBUG option is off. PR: 277585 Reported by: Matt Magoffin (cherry picked from commit 3d75c31b623969e665a9c83337efe34417cd4b78) --- net/openldap26-server/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 7d8c447560a7..2ff1eb562ae1 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -390,6 +390,11 @@ post-patch: @${REINPLACE_CMD} -E ${CONFIGURE_SED} \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif +.if !${PORT_OPTIONS:MDEBUG} + @${REINPLACE_CMD} -E \ + -e '/ldap_dump_(connection|requests_and_responses);/d' \ + ${WRKSRC}/libraries/libldap/ldap.map +.endif pre-configure: @(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)