From nobody Sat Apr 08 18:21:47 2023 X-Original-To: dev-commits-ports-all@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 4Pv3V40JTjz44jHG; Sat, 8 Apr 2023 18:21:48 +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 4Pv3V35VGrz3NyM; Sat, 8 Apr 2023 18:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680978107; 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=6YJbL41S0foSUokYimoTppDZVb7xWcWNRIvIxFCeqKg=; b=reLm817GGYlKrwsQ1P4Bx/gXHLG1KY5OBoAL8vimdwXvvIS4049RFmvg4AvUPuG9T9nJ6I d+HSywaiq3hjE0LJcbf3bqAdPVSlFbulUrxcZig6li49DpFkOoKZWrKVHjJgakvBh++Mn9 xeJj/hgJ+15cfXIGXMCRLSIzZpje/BdpXHNstDwEzcYpsUG764CbnaUHupj2wHF6kY99fC F33k8CsUnk1z0sQq4sI04mbkyich2UI5tTS5aLNzQ52Rj7+DAJSQOrNeIQYYF5TBWxn8+d gXKXW+PvbmVhc3emFrEawECjH4Ell89bmLda0Kgy6NrB0RVaFg2X6h2sWPQtTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680978107; 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=6YJbL41S0foSUokYimoTppDZVb7xWcWNRIvIxFCeqKg=; b=lR8WrVzH9frMcvy0MKtGF3qR7rLdyMoCS7Pk69+5qeiL3GVhz8m5VTKWWNlsnsc1xMGkm+ qattQfC2jzJ9GgMCwKjqp8U9fHsut3gVtHDtnKmq/wDkhGmWzpsuqcsep8+VX0TujbeFUL 65Gp5/kzgol45BZLGGymuZfcojbLEPl+qArCe5qMUUzrpWpJMz3I5XFWYopnZnSA9tSoaG X6CwaFF0hlFSVo234NfnQxpgn9eU9jakeA80qHMJQPpmjtgyb3kax343Fvbl+BJbD6W9pY 0MiRmsqeN8SqylJ+GwWwn2Cp0WnCv5YBeUPL4HS61Bp4AFLQXMu6gm2IWcarAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680978107; a=rsa-sha256; cv=none; b=f5ehHVLQHN4sZuVYNtcTOAtu59q/pr0zxR7nPNlXp3KVWyjyUEqLrXVvOSte+zS6diSD0p Qu4+B1tUSQFwPbXV2nbhIokb0QjE3q9lBdX3ApldA/yD47lvmQ7bDWvV4VyPi5ejTqIumg qbjrsVUxTaKb6USepV2xEutrnMaCbIhc336DABCB5M0JJZFTNO751ZG4SL+Y59i3Ckv22W saD1xRElNIISDggTop/9FDUj96kuFswpgGUToi8wTfwkgPMdKf7OpdLBIojU/agH21pxO+ SKPxfW6edDmgLVZRm8psPwLSTWRULw08iRgx/VR9OR8iZESjM+DOUidWUvREyg== 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 4Pv3V34cXfzcbf; Sat, 8 Apr 2023 18:21:47 +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 338ILlIo084464; Sat, 8 Apr 2023 18:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338ILlw3084463; Sat, 8 Apr 2023 18:21:47 GMT (envelope-from git) Date: Sat, 8 Apr 2023 18:21:47 GMT Message-Id: <202304081821.338ILlw3084463@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: fffb8ca3cfe0 - 2023Q2 - net-p2p/cardano-node: Fix "reload" command of the rc script. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: fffb8ca3cfe00c098d4870c7b7ba00e92dbc059b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fffb8ca3cfe00c098d4870c7b7ba00e92dbc059b commit fffb8ca3cfe00c098d4870c7b7ba00e92dbc059b Author: Gleb Popov AuthorDate: 2023-04-08 18:10:52 +0000 Commit: Gleb Popov CommitDate: 2023-04-08 18:21:43 +0000 net-p2p/cardano-node: Fix "reload" command of the rc script. While there enable LTO for this port, as it benefits greatly from this optimization. It was reported to run without issues with LTO. Reported by: Boris Polujin (cherry picked from commit f23cd3d99022696882e4ff7c68091037b36aa4f3) --- net-p2p/cardano-node/Makefile | 3 +++ net-p2p/cardano-node/files/cardano_node.in | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net-p2p/cardano-node/Makefile b/net-p2p/cardano-node/Makefile index 680990d785b1..881263e8c1f9 100644 --- a/net-p2p/cardano-node/Makefile +++ b/net-p2p/cardano-node/Makefile @@ -1,5 +1,6 @@ PORTNAME= cardano-node PORTVERSION= 1.35.7 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= https://input-output-hk.github.io/cardano-haskell-packages/package/:chap @@ -443,6 +444,8 @@ CABAL_PROJECT= append CABAL_EXECUTABLES= cardano-node cardano-cli cardano-submit-api cardano-tracer CABAL_REPOSITORIES= chap +WITH_LTO= yes + post-patch: ${REINPLACE_CMD} -e 's/$$(gitRevFromGit)/"${CARDANO_NODE_HASH}"/' \ -e '/Cardano.Git.RevFromGit/d' \ diff --git a/net-p2p/cardano-node/files/cardano_node.in b/net-p2p/cardano-node/files/cardano_node.in index df010e544630..1b9a59443e2e 100755 --- a/net-p2p/cardano-node/files/cardano_node.in +++ b/net-p2p/cardano-node/files/cardano_node.in @@ -159,6 +159,7 @@ if checkyesno "_jail_enable"; then _socket_arg="${jail_socket}" _topology_arg="${jail_topology}" _config_arg="${jail_config}" + _db_arg="/db" # We need to override ${command} to make check_pidfile work correctly when # rc.subr calls it as "check_pidfile ${pidfile} ${command}" command=/usr/sbin/jail @@ -166,11 +167,12 @@ else _socket_arg="${_socket}" _topology_arg="${_topology}" _config_arg="${_config}" + _db_arg="${_db}" fi pidfile="/var/run/${name}.pid" flags="run +RTS ${_rts_flags} -RTS \ - --database-path /db \ + --database-path ${_db_arg} \ --host-addr ${_host} \ --port ${_port} \ --socket-path ${_socket_arg} \