From c018f581cbc8d6ccabb2b0acf9958f6fedaa225f Mon Sep 17 00:00:00 2001 From: Alexandre Perrin Date: Thu, 21 Nov 2013 15:04:36 +0100 Subject: [PATCH 4/7] bmake: Apply local modifications patches. suff.c local modifications have been merged upstream, the other local modifications did apply cleanly. --- contrib/bmake/README.DRAGONFLY | 1 - contrib/bmake/bmake.1 | 2 +- contrib/bmake/meta.c | 4 ++-- contrib/bmake/parse.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/bmake/README.DRAGONFLY b/contrib/bmake/README.DRAGONFLY index b6ec79b..720290c 100644 --- a/contrib/bmake/README.DRAGONFLY +++ b/contrib/bmake/README.DRAGONFLY @@ -14,4 +14,3 @@ The file README.DELETED contains a list of deleted files and directories. The following files have been patched: bmake.1 meta.c -suff.c diff --git a/contrib/bmake/bmake.1 b/contrib/bmake/bmake.1 index df604e7..23a3035 100644 --- a/contrib/bmake/bmake.1 +++ b/contrib/bmake/bmake.1 @@ -1543,8 +1543,8 @@ PATH := ${PATH} .Li .unexport-env .Li .export PATH .Li .endif -.Pp .Ed +.Pp 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 3ec0bdc..c5e1c4e 100644 --- a/contrib/bmake/meta.c +++ b/contrib/bmake/meta.c @@ -658,7 +658,7 @@ meta_job_start(Job *job, GNode *gn) * It does not disturb our state. */ void -meta_job_child(Job *job) +meta_job_child(Job __unused *job) { #ifdef USE_FILEMON BuildMon *pbm; @@ -743,7 +743,7 @@ meta_job_output(Job *job, char *cp, const char *nl) } void -meta_cmd_finish(void *pbmp) +meta_cmd_finish(void __unused *pbmp) { #ifdef USE_FILEMON BuildMon *pbm = pbmp; diff --git a/contrib/bmake/parse.c b/contrib/bmake/parse.c index 41323b5..e9c4c76 100644 --- a/contrib/bmake/parse.c +++ b/contrib/bmake/parse.c @@ -1216,7 +1216,7 @@ ParseDoDependency(char *line) */ int length; void *freeIt; - char *result; + __unused char *result; /* XXX */ result = Var_Parse(cp, VAR_CMD, TRUE, &length, &freeIt); if (freeIt) -- 1.8.4.1