From nobody Mon Feb 13 15:15:08 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 4PFnvc450Lz3rGG9; Mon, 13 Feb 2023 15:15:08 +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 4PFnvc3X4bz4N7M; Mon, 13 Feb 2023 15:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676301308; 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=46jiSCWzh/e6Tb2GJ3ITmBqmZpgewgTpwNgrMNFcrzc=; b=dCbEYh0C97uf3aQPJ1Y7nIOJ/R3LJ5DD98wXjzC6BzuKCKpA/Y6tLsKsNOhyHvNsp2jc7W EdiXbIZUcL+Ru1rkWvUpiyldqFzodsc0GcyOl5//ZDg5rIHtx5HKPA6cR6vPReDBvM2Oxl pzUGFkWfhayzU7iKnohSsdm33U0q14qmvlcG1TXgR0Rc51DzCyxufquCBQSpi4VrGWYad9 uyLV1eSjm5reGaahvCc5H5qQrB8y8jH6dwbUAO89gC+WvMRAleCegu0PEntgxkHCN/938w kIfYG7n8Umc1WxTgG4Vjk4YwWKTsXyVVdJJ581SMlf1kGxdgAv9sWD5q0fjV8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676301308; 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=46jiSCWzh/e6Tb2GJ3ITmBqmZpgewgTpwNgrMNFcrzc=; b=lMFq5EqDfe7UX55G49IWiCYwnbbkUGJu0d1fs85Vy0c3ogdwTy4RcAbHo7t13OS1UKa4VG +iuLCUqfTdJgM5+fjPfhlu3cNc8MGdH62Qum908IRri5YxVawA4LjMYmDVmJ1d2xT9WDGG 4yWQFuvhgkvWsFXw1clG17RTNYVFy85OXTx7Mob8QJCHJYaOX3FQhTRRnQRrJpXYOr1lCJ gWLIPZXXzvmmiCXWhlmyM41Y6xucsBod26PJB6Y8jsM7eaxuDMZvvKU1lOe8da0Xj3hqQZ 9a8jE5HS+6/7/uSsXWzUeuYqUHSdPQ9ijU6DNPL46HjMpbr9MLX6QXbWcghEWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676301308; a=rsa-sha256; cv=none; b=i4SUByi8Ku/mFsi1TqRIGYgQJGU0ZRQ83sBHC9QnGi4+zGVVrnIKxyCKijy9PQqDRiNR61 2RrDHQO2eEYd0USOzbf9hG+2nybZl54KIv9Rra+3hLFJN2mNGozenH6Z9MazozcgB3HGa/ aMvEctizgg/RY8nPsseQtETwZJ2URTOgzj3lMbaZ4BnQ0RDpASqs8OOHO1WRbO6A9Cng6z VUFGYsUB7RAHlwyYe00lbLGKgfrmdez8DqXsBdcRhHnA4RCbv5C3O16OoxKKnLHS7hFNUy V2HTiqM6FyWrwIGKel7ukdVMcQ0A/yT9hvPsXCraM7y4rn95ttz05rLkmgHNmg== 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 4PFnvc2TFvzNGh; Mon, 13 Feb 2023 15:15:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DFF8SX053651; Mon, 13 Feb 2023 15:15:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DFF8no053650; Mon, 13 Feb 2023 15:15:08 GMT (envelope-from git) Date: Mon, 13 Feb 2023 15:15:08 GMT Message-Id: <202302131515.31DFF8no053650@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: 0b947cb693c9 - main - lang/solidity: move OSVERSION check after . 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: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b947cb693c987b354bbfc38b12bb0f5d2f3027b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b947cb693c987b354bbfc38b12bb0f5d2f3027b commit 0b947cb693c987b354bbfc38b12bb0f5d2f3027b Author: Alex Dupre AuthorDate: 2023-02-13 15:14:12 +0000 Commit: Alex Dupre CommitDate: 2023-02-13 15:15:04 +0000 lang/solidity: move OSVERSION check after . --- 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 + +.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