kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysutils/openzfs: fix build errors

Browse source 
* 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
This commit is contained in:
Alan Somers 2021-12-29 14:49:39 -07:00
parent c3f5352877
commit b3c2b81c82
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sysutils/openzfs/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= openzfs PORTNAME= openzfs
PORTVERSION= 2021121500 PORTVERSION= 2021121500
PORTREVISION= 1
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
CATEGORIES= sysutils CATEGORIES= sysutils
@ -11,9 +12,15 @@ LICENSE= CDDL
BROKEN_aarch64= invokes x86 assembler 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 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 RUN_DEPENDS= openzfs-kmod>=0:sysutils/openzfs-kmod
USES+= autoreconf:build cpe libtool gmake gettext-runtime python:3.3+,build shebangfix 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 GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --with-config="user" 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} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sysctl>0:devel/py-sysctl@${PY_FLAVOR}
.else .else
CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-python
PYTHON_NO_DEPENDS=yes
.endif .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: pre-configure:
cd ${WRKSRC} && ./autogen.sh cd ${WRKSRC} && ./autogen.sh

1
sysutils/openzfs/pkg-plist
View file

@ -448,6 +448,7 @@ man/man8/zfs-userspace.8.gz
man/man8/zfs-wait.8.gz man/man8/zfs-wait.8.gz
man/man8/zfs.8.gz man/man8/zfs.8.gz
man/man8/zfs_ids_to_path.8.gz man/man8/zfs_ids_to_path.8.gz
man/man8/zgenhostid.8.gz
man/man8/zinject.8.gz man/man8/zinject.8.gz
man/man8/zpool-add.8.gz man/man8/zpool-add.8.gz
man/man8/zpool-attach.8.gz man/man8/zpool-attach.8.gz