Module Name: src
Committed By: simonb
Date: Wed Mar 31 06:27:58 UTC 2021
Modified Files:
src/external/cddl/osnet/sbin/zfs: Makefile
src/external/cddl/osnet/sbin/zpool: Makefile
Log Message:
Use compat/exec.mk - zfs isn't compat32 friendly (yet?).
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sbin/zfs/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sbin/zpool/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sbin/zfs/Makefile
diff -u src/external/cddl/osnet/sbin/zfs/Makefile:1.5 src/external/cddl/osnet/sbin/zfs/Makefile:1.6
--- src/external/cddl/osnet/sbin/zfs/Makefile:1.5 Sun Sep 15 19:38:09 2019
+++ src/external/cddl/osnet/sbin/zfs/Makefile Wed Mar 31 06:27:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/09/15 19:38:09 brad Exp $
+# $NetBSD: Makefile,v 1.6 2021/03/31 06:27:58 simonb Exp $
.include "../../Makefile.zfs"
@@ -30,4 +30,6 @@ LDADD+= -lm -lutil -lpthread
.PATH: ${.CURDIR}
.PATH: ${ZFSDIR}/dist/cmd/zfs
+.include "../../compat/exec.mk"
+
.include <bsd.prog.mk>
Index: src/external/cddl/osnet/sbin/zpool/Makefile
diff -u src/external/cddl/osnet/sbin/zpool/Makefile:1.6 src/external/cddl/osnet/sbin/zpool/Makefile:1.7
--- src/external/cddl/osnet/sbin/zpool/Makefile:1.6 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sbin/zpool/Makefile Wed Mar 31 06:27:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/05/28 21:05:09 chs Exp $
+# $NetBSD: Makefile,v 1.7 2021/03/31 06:27:58 simonb Exp $
.include "../../Makefile.zfs"
@@ -36,4 +36,6 @@ LDADD+= -lm -lutil -lpthread
.PATH: ${ZFSDIR}/dist/cmd/zpool
+.include "../../compat/exec.mk"
+
.include <bsd.prog.mk>
