From 8d14ced6ea68a6467219f38f7cebfd83f2a37f66 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 16 Jul 2018 11:03:05 +0000 Subject: [PATCH] Fix buildworld on FreeBSD 10 Since r336126 we depend on explicit_bzero() for the libmd bootstrap. Add it to -legacy if it is not found in /usr/include/strings.h. Reviewed By: ian Approved By: brooks (mentor) Differential Revision: https://reviews.freebsd.org/D16245 --- tools/build/Makefile | 7 +++++++ tools/build/strings.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 tools/build/strings.h diff --git a/tools/build/Makefile b/tools/build/Makefile index 0ec295ac5dd1..1b6522b41632 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -41,6 +41,13 @@ SYSINCS+= stat.h SRCS+= futimens.c utimensat.c .endif +_WITH_EXPLICIT_BZERO!= grep -c explicit_bzero /usr/include/strings.h || true +.if ${_WITH_EXPLICIT_BZERO} == 0 +.PATH: ${SRCTOP}/sys/libkern +INCS+= strings.h +SRCS+= explicit_bzero.c +.endif + .if empty(SRCS) SRCS= dummy.c .endif diff --git a/tools/build/strings.h b/tools/build/strings.h new file mode 100644 index 000000000000..5dfb9596aaf6 --- /dev/null +++ b/tools/build/strings.h @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2015 Dimitry Andric + * Copyright (c) 2018 Alex Richardson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LEGACY_STRINGS_H_ +#define _LEGACY_STRINGS_H_ + +#include_next + +__BEGIN_DECLS + +#if __BSD_VISIBLE +void explicit_bzero(void *, size_t); +#endif /* __BSD_VISIBLE */ + +__END_DECLS + +#endif /* !_LEGACY_STRINGS_H_ */