Junio C Hamano <gitster@xxxxxxxxx> writes: > Johannes Sixt <johannes.sixt@xxxxxxxxxx> writes: > >> On Sonntag, 20. Juli 2008, Johannes Sixt wrote: >>> -git-shell$X: compat/strlcpy.o abspath.o ctype.o exec_cmd.o quote.o >>> strbuf.o usage.o wrapper.o shell.o >>> +git-shell$X: abspath.o ctype.o >>> exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o $(COMPAT_OBJS) >> >> Unfortunately, that's only half the deal. If we compile with NO_PREAD=1, this >> needs read_in_full(),... > > Well, if compat/* implementations use anything outside compat/ left and > right, then all bets are off. If compat/ layer tries to really be about "compatibility", they should not be using things like xmalloc() that call release_pack_meory() that is in sha1_file.c. From a quick glance, mingw.c, mmap.c, pread.c are major offenders, but others such as setenv.c seem to be carefully written. Perhaps we should apply a variant of your patch to allow linking from compat/ routines to git-shell, so that people affected by the compat layer functions that call outside compat layer have incentive to fix them. Makefile | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2b670d7..551bde9 100644 --- a/Makefile +++ b/Makefile @@ -324,6 +324,7 @@ endif export PERL_PATH LIB_FILE=libgit.a +COMPAT_LIB = compat/lib.a XDIFF_LIB=xdiff/lib.a LIB_H += archive.h @@ -1203,8 +1204,11 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) -git-shell$X: compat/strlcpy.o abspath.o ctype.o exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o - $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) +$(COMPAT_LIB): $(COMPAT_OBJS) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(COMPAT_OBJS) + +git-shell$X: abspath.o ctype.o exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o $(COMPAT_LIB) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(COMPAT_LIB) $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) @@ -1402,7 +1406,7 @@ distclean: clean clean: $(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \ - $(LIB_FILE) $(XDIFF_LIB) + $(LIB_FILE) $(XDIFF_LIB) $(COMPAT_LIB) $(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope* -- 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
