diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-23 03:44:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-23 03:44:34 +0000 |
| commit | f79acda48d43e57f5bf9c5890c0fd96fe26d6910 (patch) | |
| tree | 40459e0078ac1500d96a808829be7d1c45a1997e /bootstrap/bmake/var.c | |
| parent | f8dd9611442914c779dc2594d00f2334eb959510 (diff) | |
| download | pkgsrc-f79acda48d43e57f5bf9c5890c0fd96fe26d6910.tar.gz | |
* Modify bmake to use libnbcompat to ensure that a regex implementation
exists.
* nbsed-20040821 requires libnbcompat, so make the appropriate
adjustments to the build to use it.
* If nbsed is built during bootstrap, then use it as the sed for
pkg_install so that the correct program is embedded into the pkg_view
and linkfarm scripts.
* We don't need bmake to build any of the bootstrap packages, so just
call out to the system make.
Diffstat (limited to 'bootstrap/bmake/var.c')
| -rw-r--r-- | bootstrap/bmake/var.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/bootstrap/bmake/var.c b/bootstrap/bmake/var.c index 48cf7de5e00..76688887698 100644 --- a/bootstrap/bmake/var.c +++ b/bootstrap/bmake/var.c @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $ */ +/* $NetBSD: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -39,20 +39,20 @@ */ #ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $"); +__RCSID("$NetBSD: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $"); #endif #endif /* not lint */ #endif #if !defined(MAKE_BOOTSTRAP) && !defined(lint) -__IDSTRING(rcs_id,"$Id: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $"); +__IDSTRING(rcs_id,"$Id: var.c,v 1.2 2004/08/23 03:44:34 jlam Exp $"); #endif /*- @@ -100,7 +100,16 @@ __IDSTRING(rcs_id,"$Id: var.c,v 1.1.1.1 2004/03/11 13:04:14 grant Exp $"); #include <ctype.h> #ifndef NO_REGEX #include <sys/types.h> +#include <nbcompat/nbconfig.h> +/* bmake supplies its own <sys/cdefs.h> so this header is always present. */ +#ifndef HAVE_SYS_CDEFS_H +#define HAVE_SYS_CDEFS_H 1 +#endif +#if HAVE_REGEX_H #include <regex.h> +#else +#include <nbcompat/regex.h> +#endif #endif #include <stdlib.h> #include "make.h" |