svn commit: r354001 - stable/12/stand/libsa

[Kyle Evans]

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"