From owner-svn-src-stable-12@freebsd.org  Thu Oct 24 03:40:21 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D9326156C10;
 Thu, 24 Oct 2019 03:40:21 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46zCgT5PDfz4Lm5;
 Thu, 24 Oct 2019 03:40:21 +0000 (UTC)
 (envelope-from kevans@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 9D60B80C5;
 Thu, 24 Oct 2019 03:40:21 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9O3eLPK025621;
 Thu, 24 Oct 2019 03:40:21 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9O3eLuO025619;
 Thu, 24 Oct 2019 03:40:21 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201910240340.x9O3eLuO025619@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Thu, 24 Oct 2019 03:40:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r354001 - stable/12/stand/libsa
X-SVN-Group: stable-12
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: stable/12/stand/libsa
X-SVN-Commit-Revision: 354001
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-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Oct 2019 03:40:21 -0000

Author: kevans
Date: Thu Oct 24 03:40:20 2019
New Revision: 354001
URL: https://svnweb.freebsd.org/changeset/base/354001

Log:
  MFC (proactively; not required yet) r339673: Fix stand/ build after r339671.
  
  ffs_subr.c requires calculate_crc32c() from libkern.  Unfortunately we
  cannot just add libkern/crc32.c to libstand because crc32.o is already
  compiled from contrib/zlib/crc32.c. Use the include trick to rename
  the source.
  
  Note that libstand also provides crc32.c which seems to be unused.

Added:
  stable/12/stand/libsa/crc32_libkern.c
     - copied unchanged from r339673, head/stand/libsa/crc32_libkern.c
Modified:
  stable/12/stand/libsa/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/stand/libsa/Makefile
==============================================================================
--- stable/12/stand/libsa/Makefile	Thu Oct 24 03:38:16 2019	(r354000)
+++ stable/12/stand/libsa/Makefile	Thu Oct 24 03:40:20 2019	(r354001)
@@ -148,9 +148,9 @@ SRCS+=ffs_subr.c ffs_tables.c
 
 CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2
 
-# explicit_bzero
+# explicit_bzero and calculate_crc32c
 .PATH: ${SYSDIR}/libkern
-SRCS+=  explicit_bzero.c
+SRCS+=  explicit_bzero.c crc32_libkern.c
 
 # Maybe GELI
 .if ${MK_LOADER_GELI} == "yes"

Copied: stable/12/stand/libsa/crc32_libkern.c (from r339673, head/stand/libsa/crc32_libkern.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/stand/libsa/crc32_libkern.c	Thu Oct 24 03:40:20 2019	(r354001, copy of r339673, head/stand/libsa/crc32_libkern.c)
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+
+#include "../../sys/libkern/crc32.c"