Petr Baudis <pasky@xxxxxxx> wrote: > As of now, git fails to build with default config if tclsh is not > available, thus requiring manual config tweaking just because of some > optimizations done at build time; this is a needless hassle when building > git on any kind of a server. > > This patch makes git-gui's build process to handle this gracefully; unless > TCL_PATH is explicitly set, if tclsh cannot be executed only a warning is > printed and the build goes on. I have tested this only on that server with > no tclsh, but hopefully it shouldn't break the build process with tclsh > available either. > > Version 2, sorry - the previous version of the patch had the install hunk > missing. And apologies for the duplicate submission... :-) > > Signed-off-by: Petr Baudis <pasky@xxxxxxx> > --- > > Makefile | 8 +++++--- > git-gui/Makefile | 4 ++-- > 2 files changed, 7 insertions(+), 5 deletions(-) I have a couple of problems with the patch as-is. The first is of course that the patch needs to be split into two; one patch for the git-gui subdirectory itself and one for git.git. My other problem is > ifeq ($(findstring $(MAKEFLAGS),s),s) > @@ -92,7 +92,7 @@ install: all > $(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)' > $(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) > $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(libdir_SQ)' > - $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)' > + [ ! -e lib/tclIndex ] || $(INSTALL) -m644 lib/tclIndex '$(DESTDIR_SQ)$(libdir_SQ)' > $(foreach p,$(ALL_LIBFILES), $(INSTALL) -m644 $p '$(DESTDIR_SQ)$(libdir_SQ)' ;) git-gui won't work if lib/tclIndex is missing or invalid. So not installing it means we should just disable git-gui entirely. -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
