From: Alexandre Perrin <alex@kaworu.ch>
Date: Fri, 22 Nov 2013 15:42:54 +0000 (+0100)
Subject: bmake: Revert local modification patches.
X-Git-Tag: v3.9.0~1134
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/e532869642710025ce4d370a144cfbdaeabd4fcf

bmake: Revert local modification patches.

  Preparing a clean vendor branch merge.
---

diff --git a/contrib/bmake/bmake.1 b/contrib/bmake/bmake.1
index 3ffd5250e0..d7ed08af0c 100644
--- a/contrib/bmake/bmake.1
+++ b/contrib/bmake/bmake.1
@@ -1482,8 +1482,8 @@ PATH := ${PATH}
 .Li .unexport-env
 .Li .export PATH
 .Li .endif
-.Ed
 .Pp
+.Ed
 Would result in an environment containing only
 .Ql Ev PATH ,
 which is the minimal useful environment.
diff --git a/contrib/bmake/meta.c b/contrib/bmake/meta.c
index aca2716117..77af4e8071 100644
--- a/contrib/bmake/meta.c
+++ b/contrib/bmake/meta.c
@@ -626,7 +626,7 @@ meta_job_start(Job *job, GNode *gn)
  * It does not disturb our state.
  */
 void
-meta_job_child(Job __unused *job)
+meta_job_child(Job *job)
 {
 #ifdef USE_FILEMON
     BuildMon *pbm;
@@ -711,7 +711,7 @@ meta_job_output(Job *job, char *cp, const char *nl)
 }
 
 void
-meta_cmd_finish(void __unused *pbmp)
+meta_cmd_finish(void *pbmp)
 {
 #ifdef USE_FILEMON
     BuildMon *pbm = pbmp;
diff --git a/contrib/bmake/parse.c b/contrib/bmake/parse.c
index ff86465aa6..0b18f5d12e 100644
--- a/contrib/bmake/parse.c
+++ b/contrib/bmake/parse.c
@@ -1206,7 +1206,7 @@ ParseDoDependency(char *line)
 		 */
 		int 	length;
 		void    *freeIt;
-		__unused char *result; /* XXX */
+		char	*result;
 
 		result = Var_Parse(cp, VAR_CMD, TRUE, &length, &freeIt);
 		if (freeIt)
diff --git a/contrib/bmake/suff.c b/contrib/bmake/suff.c
index 8a7a2e0afa..6abdeb0459 100644
--- a/contrib/bmake/suff.c
+++ b/contrib/bmake/suff.c
@@ -2058,10 +2058,6 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
      * children, then look for any overriding transformations they imply.
      * Should we find one, we discard the one we found before.
      */
-    bottom = NULL;
-    targ = NULL;
-
-    if (!(gn->type & OP_PHONY)) {
 
     while (ln != NULL) {
 	/*
@@ -2175,7 +2171,6 @@ SuffFindNormalDeps(GNode *gn, Lst slst)
 	for (targ = bottom; targ->parent != NULL; targ = targ->parent)
 	    continue;
     }
-    }
 
     Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
 
@@ -2424,7 +2419,12 @@ SuffFindDeps(GNode *gn, Lst slst)
      */
     Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
     Var_Set(PREFIX, gn->name, gn, 0);
-
+    if (gn->type & OP_PHONY) {
+	/*
+	 * If this is a .PHONY target, we do not apply suffix rules.
+	 */
+	return;
+    }
     if (DEBUG(SUFF)) {
 	fprintf(debug_file, "SuffFindDeps (%s)\n", gn->name);
     }