From nobody Sun Jul 23 22:16:23 2023 X-Original-To: dev-commits-ports-main@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 4R8Hgr0hjJz4p9hV; Sun, 23 Jul 2023 22:16:24 +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 4R8Hgr0Cpnz4CMp; Sun, 23 Jul 2023 22:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690150584; 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=VzsMSElTUyHHAXlb15ArgW+SNROHnAN8RuYccJC74k0=; b=s9qom/duN8+JKI0+N5MbMafWNoPglXDPZAz0uIkkqCYBTMutgaVe1PxXCLGuzflATyDhpv ECQYBJaS8DbsA414wMefpKPgCjOi5pe6h9b3sEADSJAcLm8MIuCX4ZYPNmn7FKEE3V7Gx2 90TBN6FEFwGsfyTfNJ8O4LTTel/W8oSFD93kUPaeHmmICsN8IJXZ2Nl8hO1SHUGEcw+bZS 7hpjrks105JVEDGNvtDQcQppYq/lBHu8NC5e1O1k87B+EmEkrJ2Toxro5fWnNSBUdimUw2 ACPR5m14m77g2XlWs/aY7l34E/mk0Es0VR8zmAd8M9uYDMaq4ymh4gEj4OXUoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690150584; 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=VzsMSElTUyHHAXlb15ArgW+SNROHnAN8RuYccJC74k0=; b=GCDZdaYHPBaVAvf90+e6rz32RO+A+VU+st7H4lmwSuXsgDmIUBsg3ST8kvnFs5i1Stxf2W g3XW86nH/LyvxuMleXt7Bo3uU8++WrmnkL0fpISEl5/2eswpGmuKyshrAt2e2z0WGYT9Cj bda4SlnOT+BAIH753GZYvXC6u/knMz0IAB/tIjbDEc+noWdYvbAj2oUB/sGPGpGLKwhWzH xbR+jwZbIXWYVLSrfYJzxIXfnGPWUhjPTd0SUzCU+kD9p19OjpCKcLhM8CDKwXOWqYm35U gl9N0dl2XILtW6CX/31E2n+7u1590hPXUrscj7giI5Oj/2iayMO7MZwJN8gytA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690150584; a=rsa-sha256; cv=none; b=L0oitvoYBIM/yzqnM65yX8zNSuEorBdYX3tN+dk9lo816jENpsl0FWKlcRFymE8uW2W1zq eLhjxlwSslC6QGJnMC23P1ZFYsKggEOsgbCKMgYebpsue9xh2fTV7o6MzNf3gyknCbKku/ kLpn4MLsvpAS1+r6PCtjjeslt7v1l1urFe1tNLHFcTT7mEjK0HtxxcGGNFvAk1+UETr66B ts8hOKfh4YA26YmeoH/Xh1VwhjtH9QzjI6u0zsle0JiyMzJDzPPUyp4vShOdRqtg1eYBJ6 n9ynCArzbqNO4BXt6LidNRvT/5yV876oMX6l3fGO3GJv/zAV+PXs6DGlo+/XLQ== 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 4R8Hgq6HX8zt9S; Sun, 23 Jul 2023 22:16:23 +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 36NMGNjp041085; Sun, 23 Jul 2023 22:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NMGNZK041084; Sun, 23 Jul 2023 22:16:23 GMT (envelope-from git) Date: Sun, 23 Jul 2023 22:16:23 GMT Message-Id: <202307232216.36NMGNZK041084@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: caec8824b82d - main - databases/xrootd: Fix build with openssl3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caec8824b82d754312ae4b122a352e7a830530bb Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=caec8824b82d754312ae4b122a352e7a830530bb commit caec8824b82d754312ae4b122a352e7a830530bb Author: Muhammad Moinur Rahman AuthorDate: 2023-07-23 20:11:53 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-23 22:16:14 +0000 databases/xrootd: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- databases/xrootd/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/databases/xrootd/Makefile b/databases/xrootd/Makefile index cc2e9c8ba008..e4e1f1d8376f 100644 --- a/databases/xrootd/Makefile +++ b/databases/xrootd/Makefile @@ -17,8 +17,6 @@ BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libcurl.so:ftp/curl USES= cmake cpe gnome localbase:ldflags pkgconfig readline shebangfix ssl -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= Fails to build with OpenSSL 3.0.0 and later SHEBANG_GLOB= *.sh SHEBANG_FILES= utils/cms_monPerf USE_GNOME= libxml2 @@ -40,7 +38,13 @@ KERBEROS5_CMAKE_BOOL= ENABLE_KRB5 KERBEROS5_BROKEN= build picks base kerberos, but needs the port one (problem only exists in poudriere builds for some reason) KERBEROS5_LIB_DEPENDS= libkrb5.so:security/krb5 +.include + +.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} +CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L" +.endif + post-patch: @${REINPLACE_CMD} 's| dl| $${CMAKE_DL_LIBS}| ; s|-ldl|$${CMAKE_DL_LIBS}|' ${WRKSRC}/src/*.cmake ${WRKSRC}/src/*/CMakeLists.txt -.include +.include