Commit 5b8e6f85 introduced stubs for three functions that make no sense for git-shell. But those stubs defined libgit.a functions a second time so that a linker can complain. While commit 78568448 fixes this problem it introduces a new issue on the affected systems: Some versions of the Sun compiler generate references to global variables when they see extern declarations for those, even when they are never used in the code. This patch does a similar workaround for this problem as commit 5b8e6f85 did for the functions. Signed-off-by: Robert Schiele <rschiele@xxxxxxxxx> --- shell.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/shell.c b/shell.c index 6a48de0..8902ea5 100644 --- a/shell.c +++ b/shell.c @@ -3,12 +3,17 @@ #include "exec_cmd.h" #include "strbuf.h" -/* Stubs for functions that make no sense for git-shell. These stubs - * are provided here to avoid linking in external redundant modules. +/* Stubs for functions and external variables that make no sense for + * git-shell. These stubs are provided here to avoid linking in + * external redundant modules. */ void release_pack_memory(size_t need, int fd){} void trace_argv_printf(const char **argv, const char *fmt, ...){} void trace_printf(const char *fmt, ...){} +int trust_executable_bit; +const unsigned char null_sha1[20]; +const signed char hexval_table[256]; +int has_symlinks; static int do_generic_cmd(const char *me, char *arg) -- 1.5.4.5 -- 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