Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/bmake bmake: Update to 20200524.
details: https://anonhg.NetBSD.org/pkgsrc/rev/32060a80d2ea
branches: trunk
changeset: 432699:32060a80d2ea
user: nia <nia%pkgsrc.org@localhost>
date: Sun May 24 21:10:17 2020 +0000
description:
bmake: Update to 20200524.
This should help bootstrap on older platforms, such as IRIX with
the mipspro compiler.
2020-05-24 Simon J Gerraty <sjg%beast.crufty.net@localhost>
* configure.in: add AC_PROG_CC_C99 for mipspro compiler
* dirname.c: remove include of namespace.h
diffstat:
devel/bmake/Makefile | 4 +-
devel/bmake/files/ChangeLog | 5 +
devel/bmake/files/Makefile | 4 +-
devel/bmake/files/VERSION | 2 +-
devel/bmake/files/aclocal.m4 | 2 +-
devel/bmake/files/arch.c | 6 +-
devel/bmake/files/bmake.1 | 73 +++++----
devel/bmake/files/boot-strap | 2 +-
devel/bmake/files/bsd.after-import.mk | 2 +-
devel/bmake/files/buf.c | 6 +-
devel/bmake/files/buf.h | 2 +-
devel/bmake/files/compat.c | 6 +-
devel/bmake/files/cond.c | 6 +-
devel/bmake/files/configure | 227 +++++++++++++++++++++++++++------
devel/bmake/files/configure.in | 7 +-
devel/bmake/files/dir.c | 6 +-
devel/bmake/files/dir.h | 2 +-
devel/bmake/files/dirname.c | 5 +-
devel/bmake/files/for.c | 6 +-
devel/bmake/files/getopt.c | 2 +-
devel/bmake/files/hash.c | 6 +-
devel/bmake/files/hash.h | 2 +-
devel/bmake/files/install-sh | 2 +-
devel/bmake/files/job.c | 6 +-
devel/bmake/files/job.h | 2 +-
devel/bmake/files/lst.h | 2 +-
devel/bmake/files/machine.sh | 2 +-
devel/bmake/files/main.c | 6 +-
devel/bmake/files/make-conf.h | 2 +-
devel/bmake/files/make.c | 6 +-
devel/bmake/files/make.h | 2 +-
devel/bmake/files/make_malloc.c | 4 +-
devel/bmake/files/make_malloc.h | 2 +-
devel/bmake/files/makefile.in | 2 +-
devel/bmake/files/meta.c | 2 +-
devel/bmake/files/meta.h | 2 +-
devel/bmake/files/metachar.c | 4 +-
devel/bmake/files/metachar.h | 2 +-
devel/bmake/files/mkdeps.sh | 2 +-
devel/bmake/files/nonints.h | 2 +-
devel/bmake/files/os.sh | 2 +-
devel/bmake/files/parse.c | 6 +-
devel/bmake/files/pathnames.h | 4 +-
devel/bmake/files/ranlib.h | 2 +-
devel/bmake/files/realpath.c | 4 +-
devel/bmake/files/setenv.c | 2 +-
devel/bmake/files/sigcompat.c | 2 +-
devel/bmake/files/sprite.h | 2 +-
devel/bmake/files/str.c | 6 +-
devel/bmake/files/stresep.c | 2 +-
devel/bmake/files/strlcpy.c | 2 +-
devel/bmake/files/strlist.c | 6 +-
devel/bmake/files/strlist.h | 2 +-
devel/bmake/files/suff.c | 6 +-
devel/bmake/files/targ.c | 6 +-
devel/bmake/files/trace.c | 6 +-
devel/bmake/files/trace.h | 2 +-
devel/bmake/files/util.c | 8 +-
devel/bmake/files/var.c | 6 +-
devel/bmake/files/wait.h | 2 +-
60 files changed, 330 insertions(+), 183 deletions(-)
diffs (truncated from 1360 to 300 lines):
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/Makefile
--- a/devel/bmake/Makefile Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/Makefile Sun May 24 21:10:17 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2020/05/24 11:09:43 nia Exp $
+# $NetBSD: Makefile,v 1.75 2020/05/24 21:10:17 nia Exp $
-DISTNAME= bmake-20200517
+DISTNAME= bmake-20200524
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/ChangeLog
--- a/devel/bmake/files/ChangeLog Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/ChangeLog Sun May 24 21:10:17 2020 +0000
@@ -1,3 +1,8 @@
+2020-05-24 Simon J Gerraty <sjg%beast.crufty.net@localhost>
+
+ * configure.in: add AC_PROG_CC_C99 for mipspro compiler
+ * dirname.c: remove include of namespace.h
+
2020-05-17 Simon J Gerraty <sjg%beast.crufty.net@localhost>
* VERSION (_MAKE_VERSION): 20200517
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/Makefile
--- a/devel/bmake/files/Makefile Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/Makefile Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 2020/05/24 11:09:43 nia Exp $
+# $Id: Makefile,v 1.5 2020/05/24 21:10:17 nia Exp $
PROG= bmake
@@ -82,7 +82,7 @@
# should be set by now
USE_FILEMON ?= no
.if ${USE_FILEMON:tl} != "no"
-.PATH: ${.CURDIR}/filemon
+.PATH: ${srcdir}/filemon
SRCS+= filemon_${USE_FILEMON}.c
COPTS.meta.c+= -DUSE_FILEMON -DUSE_FILEMON_${USE_FILEMON:tu}
COPTS.job.c+= ${COPTS.meta.c}
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/VERSION
--- a/devel/bmake/files/VERSION Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/VERSION Sun May 24 21:10:17 2020 +0000
@@ -1,2 +1,2 @@
# keep this compatible with sh and make
-_MAKE_VERSION=20200517
+_MAKE_VERSION=20200524
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/aclocal.m4
--- a/devel/bmake/files/aclocal.m4 Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/aclocal.m4 Sun May 24 21:10:17 2020 +0000
@@ -1,5 +1,5 @@
dnl RCSid:
-dnl $Id: aclocal.m4,v 1.5 2020/05/24 11:09:43 nia Exp $
+dnl $Id: aclocal.m4,v 1.6 2020/05/24 21:10:17 nia Exp $
dnl
dnl
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/arch.c
--- a/devel/bmake/files/arch.c Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/arch.c Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.8 2020/05/24 11:09:43 nia Exp $ */
+/* $NetBSD: arch.c,v 1.9 2020/05/24 21:10:17 nia Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.8 2020/05/24 11:09:43 nia Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.9 2020/05/24 21:10:17 nia Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.8 2020/05/24 11:09:43 nia Exp $");
+__RCSID("$NetBSD: arch.c,v 1.9 2020/05/24 21:10:17 nia Exp $");
#endif
#endif /* not lint */
#endif
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/bmake.1
--- a/devel/bmake/files/bmake.1 Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/bmake.1 Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: bmake.1,v 1.11 2020/05/24 11:09:43 nia Exp $
+.\" $NetBSD: bmake.1,v 1.12 2020/05/24 21:10:17 nia Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd April 27, 2020
+.Dd May 26, 2018
.Dt BMAKE 1
.Os
.Sh NAME
@@ -272,7 +272,7 @@
.It Fl m Ar directory
Specify a directory in which to search for sys.mk and makefiles included
via the
-.Li \&< Ns Ar file Ns Li \&> Ns -style
+.Ao Ar file Ac Ns -style
include statement.
The
.Fl m
@@ -280,7 +280,7 @@
This path will override the default system include path: /usr/share/mk.
Furthermore the system include path will be appended to the search path used
for
-.Li \*q Ns Ar file Ns Li \*q Ns -style
+.Qo Ar file Qc Ns -style
include statements (see the
.Fl I
option).
@@ -1234,7 +1234,7 @@
characters so that it can be passed
safely through recursive invocations of
.Nm .
-This is equivalent to:
+This is equivalent to:
.Sq \&:S/\e\&$/&&/g:Q .
.It Cm \&:R
Replaces each word in the variable with everything but its suffix.
@@ -1429,29 +1429,6 @@
.Ar old_string
to be replaced in
.Ar new_string .
-If only
-.Ar old_string
-contains the pattern matching character
-.Ar % ,
-and
-.Ar old_string
-matches, then the result is the
-.Ar new_string .
-If only the
-.Ar new_string
-contains the pattern matching character
-.Ar % ,
-then it is not treated specially and it is printed as a literal
-.Ar %
-on match.
-If there is more than one pattern matching character
-.Ar ( % )
-in either the
-.Ar new_string
-or
-.Ar old_string ,
-only the first instance is treated specially (as the pattern character);
-all subsequent instances are treated as regular characters
.Pp
Variable expansion occurs in the normal fashion inside both
.Ar old_string
@@ -1646,9 +1623,9 @@
.Pq Ql \&.
character.
Files are included with either
-.Cm \&.include \&< Ns Ar file Ns Cm \&>
+.Cm \&.include Aq Ar file
or
-.Cm \&.include \&\*q Ns Ar file Ns Cm \&\*q .
+.Cm \&.include Pf \*q Ar file Ns \*q .
Variables between the angle brackets or double quotes are expanded
to form the file name.
If angle brackets are used, the included makefile is expected to be in
@@ -2329,13 +2306,13 @@
.Nm :
.Pp
The way that .for loop variables are substituted changed after
-.Nx 5.0
+NetBSD 5.0
so that they still appear to be variable expansions.
In particular this stops them being treated as syntax, and removes some
obscure problems using them in .if statements.
.Pp
The way that parallel makes are scheduled changed in
-.Nx 4.0
+NetBSD 4.0
so that .ORDER and .WAIT apply recursively to the dependent nodes.
The algorithms used may change again in the future.
.Ss Other make dialects
@@ -2407,6 +2384,36 @@
.Xr mkdep 1
.Sh HISTORY
.Nm
-is derived from NetBSD's
+is derived from NetBSD
.Xr make 1 .
It uses autoconf to facilitate portability to other platforms.
+.Pp
+A
+make
+command appeared in
+.At v7 .
+This
+make
+implementation is based on Adam De Boor's pmake program which was written
+for Sprite at Berkeley.
+It was designed to be a parallel distributed make running jobs on different
+machines using a daemon called
+.Dq customs .
+.Pp
+Historically the target/dependency
+.Dq FRC
+has been used to FoRCe rebuilding (since the target/dependency
+does not exist... unless someone creates an
+.Dq FRC
+file).
+.Sh BUGS
+The
+make
+syntax is difficult to parse without actually acting of the data.
+For instance finding the end of a variable use should involve scanning each
+the modifiers using the correct terminator for each field.
+In many places
+make
+just counts {} and () in order to find the end of a variable expansion.
+.Pp
+There is no way of escaping a space character in a filename.
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/boot-strap
--- a/devel/bmake/files/boot-strap Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/boot-strap Sun May 24 21:10:17 2020 +0000
@@ -115,7 +115,7 @@
# Simon J. Gerraty <sjg%crufty.net@localhost>
# RCSid:
-# $Id: boot-strap,v 1.13 2020/05/24 11:09:43 nia Exp $
+# $Id: boot-strap,v 1.14 2020/05/24 21:10:17 nia Exp $
#
# @(#) Copyright (c) 2001 Simon J. Gerraty
#
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/bsd.after-import.mk
--- a/devel/bmake/files/bsd.after-import.mk Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/bsd.after-import.mk Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-# $Id: bsd.after-import.mk,v 1.4 2020/05/24 11:09:43 nia Exp $
+# $Id: bsd.after-import.mk,v 1.5 2020/05/24 21:10:17 nia Exp $
# This makefile is for use when integrating bmake into a BSD build
# system. Use this makefile after importing bmake.
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/buf.c
--- a/devel/bmake/files/buf.c Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/buf.c Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.6 2020/05/24 11:09:43 nia Exp $ */
+/* $NetBSD: buf.c,v 1.7 2020/05/24 21:10:17 nia Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: buf.c,v 1.6 2020/05/24 11:09:43 nia Exp $";
+static char rcsid[] = "$NetBSD: buf.c,v 1.7 2020/05/24 21:10:17 nia Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)buf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: buf.c,v 1.6 2020/05/24 11:09:43 nia Exp $");
+__RCSID("$NetBSD: buf.c,v 1.7 2020/05/24 21:10:17 nia Exp $");
#endif
#endif /* not lint */
#endif
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/buf.h
--- a/devel/bmake/files/buf.h Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/buf.h Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.h,v 1.5 2020/05/24 11:09:43 nia Exp $ */
+/* $NetBSD: buf.h,v 1.6 2020/05/24 21:10:17 nia Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
diff -r f0d2d14c383e -r 32060a80d2ea devel/bmake/files/compat.c
--- a/devel/bmake/files/compat.c Sun May 24 21:04:57 2020 +0000
+++ b/devel/bmake/files/compat.c Sun May 24 21:10:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.11 2020/05/24 11:09:43 nia Exp $ */
+/* $NetBSD: compat.c,v 1.12 2020/05/24 21:10:17 nia Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.11 2020/05/24 11:09:43 nia Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.12 2020/05/24 21:10:17 nia Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
Home |
Main Index |
Thread Index |
Old Index