[PATCH] Remove perl dependant commands if NO_PERL is set

garga@freebsd.org· Sep 3, 2015, 19:46 UTC · lore

From: Renato Botelho <garga@FreeBSD.org>

git-submodule and git-request-pull are written in sh but use perl internally. Add them to be replaced by unimplemented.sh when NO_PERL flag is set

Signed-off-by: Renato Botelho <garga@FreeBSD.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Makefile +1 −1

diff --git a/Makefile b/Makefile
index e326fa0..4dae0ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1795,7 +1795,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
 	chmod +x $@+ && \
 	mv $@+ $@
 else # NO_PERL
-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
+$(SCRIPT_PERL_GEN) git-instaweb git-submodule git-request-pull: % : unimplemented.sh
 	$(QUIET_GEN)$(RM) $@ $@+ && \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \

-- 
2.5.1

Junio C Hamano· Sep 3, 2015, 20:04 UTC · re: garga@freebsd.org · lore

Re: [PATCH] Remove perl dependant commands if NO_PERL is set

garga@FreeBSD.org writes:

Show 24 quoted lines

> From: Renato Botelho <garga@FreeBSD.org>
>
> git-submodule and git-request-pull are written in sh but use perl
> internally. Add them to be replaced by unimplemented.sh when NO_PERL
> flag is set
>
> Signed-off-by: Renato Botelho <garga@FreeBSD.org>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index e326fa0..4dae0ec 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1795,7 +1795,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
>  	chmod +x $@+ && \
>  	mv $@+ $@
>  else # NO_PERL
> -$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
> +$(SCRIPT_PERL_GEN) git-instaweb git-submodule git-request-pull: % : unimplemented.sh
>  	$(QUIET_GEN)$(RM) $@ $@+ && \
>  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
>  	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \

Thanks, but this I suspect is insufficient. In the pre-context of your patch, you can see we have a rule to create git-instaweb when NO_PERL is not in effect, so either way, we only have one rule to create git-instaweb.

You are not disabling the rule to create the real git-submodule and git-request-pull when NO_PERL is in effect with this patch, without it, 'make' cannot tell which variant of git-submodule and git-request-pull needs to be built.

I agree replacing commands with unimplemented may be a good thing; I do not object to the goal of the patch. But hopefully you now see why it is too late to start discussing it with 2.6 as the goal.

patchRemove perl dependant commands if NO_PERL is set