Date: Mon, 13 Feb 2023 15:15:08 GMT From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0b947cb693c9 - main - lang/solidity: move OSVERSION check after <bsd.port.options.mk>. Message-ID: <202302131515.31DFF8no053650@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b947cb693c987b354bbfc38b12bb0f5d2f3027b commit 0b947cb693c987b354bbfc38b12bb0f5d2f3027b Author: Alex Dupre <ale@FreeBSD.org> AuthorDate: 2023-02-13 15:14:12 +0000 Commit: Alex Dupre <ale@FreeBSD.org> CommitDate: 2023-02-13 15:15:04 +0000 lang/solidity: move OSVERSION check after <bsd.port.options.mk>. --- lang/solidity/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index 17fe363ea043..b94da21cce7c 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -32,10 +32,6 @@ Z3_CMAKE_OFF= USE_Z3 CVC4_CMAKE_OFF= USE_CVC4 CVC4_BROKEN= solidity uses cvc4 which has been succeeded by cvc5 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 -CXXFLAGS= -Wno-unqualified-std-cast-call -.endif - CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \ -DRANGE_V3_INCLUDE_DIR="${LOCALBASE}/include" \ -DJSONCPP_INCLUDE_DIR:STRING="${LOCALBASE}/include/jsoncpp" \ @@ -45,6 +41,12 @@ CMAKE_ARGS+= -DUSE_LD_GOLD=OFF -DTESTS=OFF \ PLIST_FILES= bin/solc \ bin/yul-phaser +.include <bsd.port.options.mk> + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CXXFLAGS+= -Wno-unqualified-std-cast-call +.endif + pre-patch: @${CP} ${FILESDIR}/fmtlib.cmake ${FILESDIR}/jsoncpp.cmake ${WRKSRC}/cmake/ @${REINPLACE_CMD} '/EthCcache/d' ${WRKSRC}/CMakeLists.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302131515.31DFF8no053650>