svn commit: r336336 - head/tools/build

[Alex Richardson]

Author: arichardson
Date: Mon Jul 16 11:03:05 2018
New Revision: 336336
URL: https://svnweb.freebsd.org/changeset/base/336336

Log:
  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

Added:
  head/tools/build/strings.h   (contents, props changed)
Modified:
  head/tools/build/Makefile

Modified: head/tools/build/Makefile
==============================================================================
--- head/tools/build/Makefile	Mon Jul 16 10:57:26 2018	(r336335)
+++ head/tools/build/Makefile	Mon Jul 16 11:03:05 2018	(r336336)
@@ -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

Added: head/tools/build/strings.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/strings.h	Mon Jul 16 11:03:05 2018	(r336336)
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2015 Dimitry Andric <dim at FreeBSD.org>
+ * Copyright (c) 2018 Alex Richardson <arichardson at FreeBSD.org>
+ *
+ * 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 <strings.h>
+
+__BEGIN_DECLS
+
+#if __BSD_VISIBLE
+void	 explicit_bzero(void *, size_t);
+#endif /* __BSD_VISIBLE */
+
+__END_DECLS
+
+#endif /* !_LEGACY_STRINGS_H_ */