From owner-svn-ports-all@freebsd.org Mon Feb 26 20:19:52 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FF74F035A0; Mon, 26 Feb 2018 20:19:52 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B9B2875C9; Mon, 26 Feb 2018 20:19:52 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 127BE202B4; Mon, 26 Feb 2018 20:19:52 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1QKJp5g055176; Mon, 26 Feb 2018 20:19:51 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QKJp6G055174; Mon, 26 Feb 2018 20:19:51 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201802262019.w1QKJp6G055174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 26 Feb 2018 20:19:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463046 - head/sysutils/smartmontools/files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sysutils/smartmontools/files X-SVN-Commit-Revision: 463046 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 20:19:52 -0000 Author: cy Date: Mon Feb 26 20:19:51 2018 New Revision: 463046 URL: https://svnweb.freebsd.org/changeset/ports/463046 Log: Fix build under -CURRENT following Sr329824. This commit does not address big endian support, which will be addressed by a separate revision and commit. This commit (and revision) only addresses build breakage due to Sr329824. Approved by: imp, wma, kan, mst_semihalf.com (Michal Stanek) Differential Revision: https://reviews.freebsd.org/D14483 Added: head/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h (contents, props changed) Modified: head/sysutils/smartmontools/files/patch-os__freebsd.cpp (contents, props changed) Added: head/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/smartmontools/files/patch-freebsd__nvme__ioctl.h Mon Feb 26 20:19:51 2018 (r463046) @@ -0,0 +1,13 @@ +--- freebsd_nvme_ioctl.h.orig 2017-09-20 10:34:38.000000000 -0700 ++++ freebsd_nvme_ioctl.h 2018-02-22 23:04:32.250104000 -0800 +@@ -148,8 +148,10 @@ + #include + #endif + ++#if __FreeBSD_version < 1200058 + #define nvme_completion_is_error(cpl) \ + ((cpl)->status.sc != 0 || (cpl)->status.sct != 0) ++#endif + + #define NVME_CTRLR_PREFIX "/dev/nvme" + #define NVME_NS_PREFIX "ns" Modified: head/sysutils/smartmontools/files/patch-os__freebsd.cpp ============================================================================== --- head/sysutils/smartmontools/files/patch-os__freebsd.cpp Mon Feb 26 20:16:12 2018 (r463045) +++ head/sysutils/smartmontools/files/patch-os__freebsd.cpp Mon Feb 26 20:19:51 2018 (r463046) @@ -1,6 +1,14 @@ ---- os_freebsd.cpp.orig 2017-04-24 16:34:16 UTC -+++ os_freebsd.cpp -@@ -484,7 +484,7 @@ bool freebsd_nvme_device::open() +--- os_freebsd.cpp.orig 2017-04-24 09:34:16.000000000 -0700 ++++ os_freebsd.cpp 2018-02-22 23:01:44.118712000 -0800 +@@ -15,6 +15,7 @@ + * + */ + ++#include + #include + #include + #include +@@ -484,7 +485,7 @@ } nsid = 0xFFFFFFFF; // broadcast id } @@ -9,3 +17,16 @@ &ctrlid, &nsid, &tmp) == 2) { if(ctrlid < 0 || nsid < 0) { +@@ -521,7 +522,11 @@ + struct nvme_pt_command pt; + memset(&pt, 0, sizeof(pt)); + +- pt.cmd.opc = in.opcode; ++#if __FreeBSD_version >= 1200058 ++ pt.cmd.opc_fuse = NVME_CMD_SET_OPC(in.opcode); ++#else ++ pt.cmd.opc_fuse = in.opcode; ++#endif + pt.cmd.nsid = in.nsid; + pt.buf = in.buffer; + pt.len = in.size;