From nobody Tue Jan 04 18:01:43 2022 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 89B931922D53; Tue, 4 Jan 2022 18:01:43 +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 4JT0ml27VLz4sL6; Tue, 4 Jan 2022 18:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 299E21D8AB; Tue, 4 Jan 2022 18:01:43 +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 204I1hFa021636; Tue, 4 Jan 2022 18:01:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204I1hkN021635; Tue, 4 Jan 2022 18:01:43 GMT (envelope-from git) Date: Tue, 4 Jan 2022 18:01:43 GMT Message-Id: <202201041801.204I1hkN021635@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alan Somers Subject: git: b3c2b81c82c2 - main - sysutils/openzfs: fix build errors 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: asomers X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3c2b81c82c2fd58922c342af05977bea8be99c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641319303; 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=jyKVJ4kTeXJYNSuQbaQr6Ev4JyI/HeLURMym3U3gOlo=; b=XPJjYVUOtoPhbqtuUIzq/gyA1bS8sBP0KukefaEBKjXKtxzymJY4MY/K2eFEfJedugwwP/ evnr01hgynKEi/kwFRx9JO1CdiTQWwYDWT6UGIvZNDfXeshdoXmZFb9a3xfY/9aO5QoE90 UIgv9m7HbaVSMz0j2em6mPg54SgUJdpJ6+c11t4MlKdUwRnOLCVUgZQiRJNPNn0JJ0XV1B ngqsuTNv1ZJ5evth6+aC2mo59OdaP+jMmRL4Ox1OWfIj2064ToJgq9YnhBIKyYYwSBEmKg ujLns4CtdKcMkK6Wvvybpq5lL09xjR47tXH5CbzMVaUUTL5fUvaUMbcOJxJ+zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641319303; a=rsa-sha256; cv=none; b=CeFrAxKtUFjHmptXtt8A7am4vNTqlhyvw/oFr8y8i3bxUNYotnVqCTKUhOSsFb+2xKxQoq 939tCmpOYZGLqsB2zE/D5mplpAe99aiO/enO6evxale5A6Zpy+svwC7ysMfTv2ZZfTt2Cs mNsBXOU7cztmrGHv+vfM1XlHmqua7hWcRw6IxDNfaKbUNvliLgwqS/CuGbzV0wtzeoA0tw BfARWqP+awz1wFiuvy0zJNj62ev57rCpzdlGl///08RvydgZXd/rzQxrxDTkYKgKqToyQj fKYHiA3d4aYBoRz2lmgWZS4Hy/kvqxnhH4CuPYkrIJFpVQhJHWEm2yClzkn8Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=b3c2b81c82c2fd58922c342af05977bea8be99c1 commit b3c2b81c82c2fd58922c342af05977bea8be99c1 Author: Alan Somers AuthorDate: 2021-12-29 21:49:39 +0000 Commit: Alan Somers CommitDate: 2022-01-04 17:59:56 +0000 sysutils/openzfs: fix build errors * Missing file in pkg-plist * shebangfix not applied everywhere Sponsored by: Axcient Reviewed by: freqlabs Approved by: lwhsu (ports) Differential Revision: https://reviews.freebsd.org/D33692 --- sysutils/openzfs/Makefile | 16 ++++++++++++++++ sysutils/openzfs/pkg-plist | 1 + 2 files changed, 17 insertions(+) diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile index ea3b0e2d3f6d..5e8d6435e261 100644 --- a/sysutils/openzfs/Makefile +++ b/sysutils/openzfs/Makefile @@ -1,5 +1,6 @@ PORTNAME= openzfs PORTVERSION= 2021121500 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -11,9 +12,15 @@ LICENSE= CDDL BROKEN_aarch64= invokes x86 assembler BROKEN_riscv64= fails to compile: btree_test.c:462:49: result of comparison of constant -1 with expression of type 'char' is always true +BUILD_DEPENDS= ksh93:shells/ksh93 RUN_DEPENDS= openzfs-kmod>=0:sysutils/openzfs-kmod USES+= autoreconf:build cpe libtool gmake gettext-runtime python:3.3+,build shebangfix +SHEBANG_GLOB= *.ksh *.ksh.in *.kshlib *.py.in +SHEBANG_FILES= tests/zfs-tests/tests/functional/trim/trim.cfg \ + cmd/arcstat/arcstat.in \ + cmd/dbufstat/dbufstat.in \ + cmd/arc_summary/arc_summary* GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-config="user" @@ -45,8 +52,17 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sysctl>0:devel/py-sysctl@${PY_FLAVOR} .else CONFIGURE_ARGS+= --without-python +PYTHON_NO_DEPENDS=yes .endif +post-extract: + # Change certain shebangs into something that shebang fix understands + cd ${WRKSRC} && sed -i '' '1s:@PYTHON_SHEBANG@:python3:' \ + tests/test-runner/bin/zts-report.py.in \ + tests/test-runner/bin/test-runner.py.in \ + cmd/arcstat/arcstat.in \ + cmd/dbufstat/dbufstat.in + pre-configure: cd ${WRKSRC} && ./autogen.sh diff --git a/sysutils/openzfs/pkg-plist b/sysutils/openzfs/pkg-plist index 772141666070..105495a264a2 100644 --- a/sysutils/openzfs/pkg-plist +++ b/sysutils/openzfs/pkg-plist @@ -448,6 +448,7 @@ man/man8/zfs-userspace.8.gz man/man8/zfs-wait.8.gz man/man8/zfs.8.gz man/man8/zfs_ids_to_path.8.gz +man/man8/zgenhostid.8.gz man/man8/zinject.8.gz man/man8/zpool-add.8.gz man/man8/zpool-attach.8.gz