upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-14 19:20:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix stand/ build after r339671.

Browse source 
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.

Reviewed by:	imp
Sponsored by:	The FreeBSD Foundation
Differential revision:	https://reviews.freebsd.org/D17677
This commit is contained in:
Konstantin Belousov 2018-10-23 23:11:38 +00:00
parent 8ff7fad1d7
commit ad6f5f9ab5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stand/libsa/Makefile
View file

@ -155,9 +155,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"

3
stand/libsa/crc32_libkern.c Normal file
View file

@ -0,0 +1,3 @@
/* $FreeBSD$ */
#include "../../sys/libkern/crc32.c"