From 2630fc0e1e32d315721945f31bbdcc01b5028404 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Fri, 20 Feb 2004 11:55:14 +0000
Subject: Unbreak the upgrade path from 4.9 after removal of GNU getopt and
 <gnuregex.h>.

---
 tools/build/Makefile | 12 ++++++++++++
 tools/build/regex.h  |  4 ++++
 2 files changed, 16 insertions(+)
 create mode 100644 tools/build/regex.h

(limited to 'tools/build')

diff --git a/tools/build/Makefile b/tools/build/Makefile
index fee9e40..fa5bae2 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -51,6 +51,18 @@ SRCS+=		progname.c
 SRCS+=		strtofflags.c
 .endif
 
+# Lot of tools need <getopt.h> and getopt_long(3).
+.if !exists(/usr/include/getopt.h)
+INCS+=		getopt.h
+.PATH: ${.CURDIR}/../../lib/libc/stdlib
+SRCS+=		getopt_long.c
+.endif
+
+# Some tools depend on a new <regex.h> not requiring <sys/types.h>.
+.if ${BOOTSTRAPPING} < 500042
+INCS+=		regex.h
+.endif
+
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif
diff --git a/tools/build/regex.h b/tools/build/regex.h
new file mode 100644
index 0000000..3de6076
--- /dev/null
+++ b/tools/build/regex.h
@@ -0,0 +1,4 @@
+/* $FreeBSD$ */
+
+#include <sys/types.h>
+#include "/usr/include/regex.h"
-- 
cgit v1.1