diff options
| author | fernape <fernape@FreeBSD.org> | 2018-09-07 23:45:14 +0800 |
|---|---|---|
| committer | fernape <fernape@FreeBSD.org> | 2018-09-07 23:45:14 +0800 |
| commit | 2944003ef3c0e87fb68ddac5162080f184d8c733 (patch) | |
| tree | 353213c7af54b7b1359030a01ee5f7b731e96ab3 /sysutils | |
| parent | 59bf3e099df7bc170889324f0d55a83a520469b8 (diff) | |
| download | freebsd-ports-gnome-2944003ef3c0e87fb68ddac5162080f184d8c733.tar.gz freebsd-ports-gnome-2944003ef3c0e87fb68ddac5162080f184d8c733.tar.zst freebsd-ports-gnome-2944003ef3c0e87fb68ddac5162080f184d8c733.zip | |
sysutils/smartmontools: unbreak in 12-CURRENT
Between __FreeBSD_version 1200058 and 1200081 fields opc and fuse of
struct nvme_command (sys/dev/nvme/nvme.h) where merged under opc_fuse, but
in r338182 this change was undone and this port broke.
Update patch to fix it so it works regardless of the revision we check out.
PR: 230867
Submitted by: ohartmann@walstatt.org
Approved by: tcberner (mentor), maintainer (timeout, 2 weeks)
Differential Revision: https://reviews.freebsd.org/D16908
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/smartmontools/files/patch-os__freebsd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/smartmontools/files/patch-os__freebsd.cpp b/sysutils/smartmontools/files/patch-os__freebsd.cpp index 87e960a3f22b..1418f1925d51 100644 --- a/sysutils/smartmontools/files/patch-os__freebsd.cpp +++ b/sysutils/smartmontools/files/patch-os__freebsd.cpp @@ -22,7 +22,7 @@ struct nvme_pt_command pt; memset(&pt, 0, sizeof(pt)); -+#if __FreeBSD_version >= 1200058 ++#if __FreeBSD_version >= 1200058 && __FreeBSD_version < 1200081 + pt.cmd.opc_fuse = NVME_CMD_SET_OPC(in.opcode); +#else pt.cmd.opc = in.opcode; |