From nobody Sat Apr 8 18:12:37 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 4Pv3HV1yk8z44jFp; Sat, 8 Apr 2023 18:12:38 +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 4Pv3HT73hPz4b1B; Sat, 8 Apr 2023 18:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680977558; 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=VxdsbhwITyCsSNpU0iIFa1zt9zW7DmZP6X5wEp9DKHQ=; b=aeBF5lzvB1jx60yc2CVj55UV6+lGBdMNkPVTNBAiFxXGChJ18UvFLmzIdVSnR08oe9GMEo Hq52nJOZjG4poapWBL3Tw10532czP5jGRBOj7MB0J58VBbI7mpCS+Cy+TzJfLSl8CiCpvw xt/2H/l85domRTLhpqEfAhG8mcfENnVDCj2IkpVd9oSGD4katItuIloj5Gei1UoraFDYiP FXSlXLrvaTNbvWqW+Vlu7DcJ3kJJtQqWlLoPn9ie490B/m9ayf9NgVWb1f4i4U0ta867jV p5IK+SZeWiXDIiVrLYS3rwBvYm+n+eOQJ7sU7m/2gJ2nX7oiD1xQ9ny6OW/eCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680977558; 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=VxdsbhwITyCsSNpU0iIFa1zt9zW7DmZP6X5wEp9DKHQ=; b=OU6MZXOGOfOnYTFd/Iu4d1rX8XSifc7rK8qA0/Tw8LaUJ62XKP/ZWFR5hdVHKf5KoXCWjd 9fgQ3EILu0zzRlgD/zZ4hJNJRj5VaZ0xD81wVr1E8m1Z4OjzuPgZLe6HhTiiS/KQCNQVT6 zte1cx0gLK6Len84lB7+976Vp87KV5cRpPDms4H2ri5QLmkBQfqYxkLw0FbR+ZX/ibiHYF rTqKLj/y/tj1hgYtKwZOrVwePmfxt5Y8E2VDGLL3opsPG+eW05egRBTsFxSZJNlToYNFrO osXO0s5IvpJuwWp6zdqYNphB02xiT7UUXuUUsWmPmf6jg1ZWENjnLbe8+EBpAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680977558; a=rsa-sha256; cv=none; b=G1t+2rXYixnDOHMXO0tSm6Qq7ZuzyBrDPEkrqQ24f4oz6Soy9IPw6MfgM7FzzP7gN6JcHW aXW9462OxRSCEpz/Vz51KCFMe1Pjo8QIAttLBJ+9uQL5ew86zNOg7/8gpP6+9Ihd0jDiq2 5hlnjNFSLEtz4HxuCj90lCdWOQLvk5VNyAO9sbuJvgEDMyZW2o3T15t/ljKFxFIJh45qTu ObRduKMK+AV/dB/shYM3LV0+QmjGbI0U2InzSCrSnDOGcU4j6NJKu97xKyQu7745UAXLRm 6TyYSrsTuv7S0HdLMZ7nla9pmM3kigv7pn4oyylxAPXWa/g0x2fL84X/VBbvfw== 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 4Pv3HT4XRVzcq1; Sat, 8 Apr 2023 18:12:37 +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 338ICbxB069037; Sat, 8 Apr 2023 18:12:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338ICbHS069036; Sat, 8 Apr 2023 18:12:37 GMT (envelope-from git) Date: Sat, 8 Apr 2023 18:12:37 GMT Message-Id: <202304081812.338ICbHS069036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: f23cd3d99022 - main - net-p2p/cardano-node: Fix "reload" command of the rc script. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f23cd3d99022696882e4ff7c68091037b36aa4f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f23cd3d99022696882e4ff7c68091037b36aa4f3 commit f23cd3d99022696882e4ff7c68091037b36aa4f3 Author: Gleb Popov AuthorDate: 2023-04-08 18:10:52 +0000 Commit: Gleb Popov CommitDate: 2023-04-08 18:12:31 +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 --- 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} \