0002-bmake-Revert-local-modification-patches.patch

kAworu, 11/22/2013 07:57 AM

Download (3.72 KB)

View differences:

contrib/bmake/README.DELETED
1
unit-tests/
2
PSD.doc/
3
missing/
contrib/bmake/README.DRAGONFLY
1
BMAKE 2012-10-10
2
================
3

  
4
Original source can be downloaded from:
5
http://www.crufty.net/ftp/pub/sjg
6

  
7
file = bmake-20121010.tar.gz
8
date = 13 October 2012
9
size = 438070
10
sha1 = 1a23e034d77459bc82e5259dea029514403ce484
11

  
12
The file README.DELETED contains a list of deleted files and directories.
13

  
14
The following files have been patched:
15
bmake.1
16
meta.c
17
suff.c
contrib/bmake/bmake.1
1482 1482
.Li .unexport-env
1483 1483
.Li .export PATH
1484 1484
.Li .endif
1485
.Ed
1486 1485
.Pp
1486
.Ed
1487 1487
Would result in an environment containing only
1488 1488
.Ql Ev PATH ,
1489 1489
which is the minimal useful environment.
contrib/bmake/meta.c
626 626
 * It does not disturb our state.
627 627
 */
628 628
void
629
meta_job_child(Job __unused *job)
629
meta_job_child(Job *job)
630 630
{
631 631
#ifdef USE_FILEMON
632 632
    BuildMon *pbm;
......
711 711
}
712 712

  
713 713
void
714
meta_cmd_finish(void __unused *pbmp)
714
meta_cmd_finish(void *pbmp)
715 715
{
716 716
#ifdef USE_FILEMON
717 717
    BuildMon *pbm = pbmp;
contrib/bmake/parse.c
1206 1206
		 */
1207 1207
		int 	length;
1208 1208
		void    *freeIt;
1209
		__unused char *result; /* XXX */
1209
		char	*result;
1210 1210

  
1211 1211
		result = Var_Parse(cp, VAR_CMD, TRUE, &length, &freeIt);
1212 1212
		if (freeIt)
contrib/bmake/suff.c
2058 2058
     * children, then look for any overriding transformations they imply.
2059 2059
     * Should we find one, we discard the one we found before.
2060 2060
     */
2061
    bottom = NULL;
2062
    targ = NULL;
2063

  
2064
    if (!(gn->type & OP_PHONY)) {
2065 2061

  
2066 2062
    while (ln != NULL) {
2067 2063
	/*
......
2175 2171
	for (targ = bottom; targ->parent != NULL; targ = targ->parent)
2176 2172
	    continue;
2177 2173
    }
2178
    }
2179 2174

  
2180 2175
    Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
2181 2176

  
......
2424 2419
     */
2425 2420
    Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
2426 2421
    Var_Set(PREFIX, gn->name, gn, 0);
2427

  
2422
    if (gn->type & OP_PHONY) {
2423
	/*
2424
	 * If this is a .PHONY target, we do not apply suffix rules.
2425
	 */
2426
	return;
2427
    }
2428 2428
    if (DEBUG(SUFF)) {
2429 2429
	fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
2430 2430
    }
2431
-