diff options
author | maya <maya@pkgsrc.org> | 2016-11-04 17:55:37 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2016-11-04 17:55:37 +0000 |
commit | a5606f48edbc95ff7fe498dfff8f27de3b1fc35c (patch) | |
tree | 3846cd7107bc60bca8675fc8dd949183c84e9cb9 /sysutils | |
parent | 9dbcc91a85a616e0f6ce3332eb6e0145f9ac27bb (diff) | |
download | pkgsrc-a5606f48edbc95ff7fe498dfff8f27de3b1fc35c.tar.gz |
smartmontools: build fix for FreeBSD-11 and newer.
don't redefine now existing things, nvme_command and ATA_SET_FEATURES
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/smartmontools/distinfo | 4 | ||||
-rw-r--r-- | sysutils/smartmontools/patches/patch-atacmds.h | 17 | ||||
-rw-r--r-- | sysutils/smartmontools/patches/patch-freebsd_nvme_ioctl.h | 22 |
3 files changed, 42 insertions, 1 deletions
diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index c0ddb03f069..f93c35fd787 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2016/05/08 11:23:15 nonaka Exp $ +$NetBSD: distinfo,v 1.28 2016/11/04 17:55:37 maya Exp $ SHA1 (smartmontools-6.5.tar.gz) = 7e788b429534a4ae627858fbcc826b93402cee7e RMD160 (smartmontools-6.5.tar.gz) = e62d15d406a92b75fa239603180c6b587f9d2aa8 @@ -6,4 +6,6 @@ SHA512 (smartmontools-6.5.tar.gz) = dca7a6363ab7280ee4197155025f624c978886dcc94f Size (smartmontools-6.5.tar.gz) = 855642 bytes SHA1 (patch-aa) = bd08aff267f0e9e9307ebc57858e61e35144bf16 SHA1 (patch-ag) = 01b0b35d89d6d6a11b13b3c05a141c46a0c1590b +SHA1 (patch-atacmds.h) = be9973be0245de7ac526b0018e7bbca28c6fa529 +SHA1 (patch-freebsd_nvme_ioctl.h) = 2cb97cb4000624d8d121f8406b79d481751a5b77 SHA1 (patch-os__netbsd.cpp) = 28f78c08d7c7287165cfa38f8ee3467b3b03cb44 diff --git a/sysutils/smartmontools/patches/patch-atacmds.h b/sysutils/smartmontools/patches/patch-atacmds.h new file mode 100644 index 00000000000..b52273f190f --- /dev/null +++ b/sysutils/smartmontools/patches/patch-atacmds.h @@ -0,0 +1,17 @@ +$NetBSD: patch-atacmds.h,v 1.1 2016/11/04 17:55:37 maya Exp $ + +don't redefine ATA_SET_FEATURES if it's already defined +build fix for FreeBSD-11 + +--- atacmds.h.orig 2015-10-31 09:36:16.000000000 -0700 ++++ atacmds.h 2016-06-15 19:39:43.425233000 -0700 +@@ -74,7 +74,9 @@ + #define ATA_IDLE 0xe3 + #define ATA_SMART_CMD 0xb0 + #define ATA_SECURITY_FREEZE_LOCK 0xf5 ++#ifndef ATA_SET_FEATURES + #define ATA_SET_FEATURES 0xef ++#endif + #define ATA_STANDBY_IMMEDIATE 0xe0 + + // SET_FEATURES subcommands diff --git a/sysutils/smartmontools/patches/patch-freebsd_nvme_ioctl.h b/sysutils/smartmontools/patches/patch-freebsd_nvme_ioctl.h new file mode 100644 index 00000000000..5a7135a6ff2 --- /dev/null +++ b/sysutils/smartmontools/patches/patch-freebsd_nvme_ioctl.h @@ -0,0 +1,22 @@ +$NetBSD: patch-freebsd_nvme_ioctl.h,v 1.1 2016/11/04 17:55:37 maya Exp $ + +Don't redefine nvme_command on newer FreeBSD + +--- freebsd_nvme_ioctl.h.orig 2016-03-28 09:25:56.000000000 -0700 ++++ freebsd_nvme_ioctl.h 2016-06-15 20:43:22.389493000 -0700 +@@ -31,6 +31,7 @@ + + #define NVME_PASSTHROUGH_CMD _IOWR('n', 0, struct nvme_pt_command) + ++#if __FreeBSD_version < 1100110 + struct nvme_command + { + /* dword 0 */ +@@ -143,6 +144,7 @@ + */ + struct mtx * driver_lock; + }; ++#endif + + #define nvme_completion_is_error(cpl) \ + ((cpl)->status.sc != 0 || (cpl)->status.sct != 0) |