From owner-svn-src-stable@freebsd.org  Sun Mar 18 19:05:07 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 1D0DCF4ADC9;
 Sun, 18 Mar 2018 19:05:07 +0000 (UTC) (envelope-from imp@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 B70C2817D4;
 Sun, 18 Mar 2018 19:05:06 +0000 (UTC) (envelope-from imp@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 B1FF7246BF;
 Sun, 18 Mar 2018 19:05:06 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2IJ56UR042686;
 Sun, 18 Mar 2018 19:05:06 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2IJ567l042685;
 Sun, 18 Mar 2018 19:05:06 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201803181905.w2IJ567l042685@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 18 Mar 2018 19:05:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r331142 - stable/11/stand
X-SVN-Group: stable-11
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: stable/11/stand
X-SVN-Commit-Revision: 331142
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Mar 2018 19:05:07 -0000

Author: imp
Date: Sun Mar 18 19:05:06 2018
New Revision: 331142
URL: https://svnweb.freebsd.org/changeset/base/331142

Log:
  Direct commit to stable
  
  Remove libstand32 here. pc98 is a 32-bit platform, so it shouldn't compile
  the extra 32-bit copy of libsa. The copy built in libstand is already 32-bit.
  Add a comment saying we need an empty Makefile.pc98 since otherwise it would
  pull in Makefile.i386 and there is no EFI on pc98, and the machines are too
  old to have ZFS or GELI be a viable option (and besides, those don't compile).
  
  Note: We also need r331140 to be MFC'd for pc98 build to work in all cases.

Modified:
  stable/11/stand/Makefile.pc98

Modified: stable/11/stand/Makefile.pc98
==============================================================================
--- stable/11/stand/Makefile.pc98	Sun Mar 18 18:58:47 2018	(r331141)
+++ stable/11/stand/Makefile.pc98	Sun Mar 18 19:05:06 2018	(r331142)
@@ -1,3 +1,4 @@
 # $FreeBSD$
 
-SUBDIR+=		libstand32
+# Need an empty file here so Makefile.i386 isn't used (which contains options
+# that don't work on pc98).