From: Junio C Hamano Date: Thu, 04 May 2006 23:00:26 GMT Subject: Re: [PATCH] Fix linking with OpenSSL Message-ID: <7vslnp2y5x.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7vwtd12z6h.fsf@assigned-by-dhcp.cox.net> Junio C Hamano writes: > Alexey Dobriyan writes: > >> For those who put it into interesting (read: default) place. >> >> Signed-off-by: Alexey Dobriyan >> >> --- a/Makefile >> +++ b/Makefile >> @@ -559,7 +559,7 @@ git-http-push$X: revision.o http.o http- >> >> git-rev-list$X: rev-list.o $(LIB_FILE) >> $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ >> - $(LIBS) $(OPENSSL_LIBSSL) >> + $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) >> >> init-db.o: init-db.c >> $(CC) -c $(ALL_CFLAGS) \ > > We used to depend on bignum from openssl for rev-list > (merge-order), and if I remember correctly that was the only > reason built recipe for rev-list is different from other > programs. I wonder if we can just get rid of this thing, and > have it built with git-%$X rule like everybody else. > > Can somebody try that out and report what happens? Well, I did. Alexey, does this work for you? -- >8 -- diff --git a/Makefile b/Makefile index a3f7e92..814010d 100644 --- a/Makefile +++ b/Makefile @@ -564,10 +564,6 @@ git-http-push$X: revision.o http.o http- $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) -git-rev-list$X: rev-list.o $(LIB_FILE) - $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ - $(LIBS) $(OPENSSL_LIBSSL) - init-db.o: init-db.c $(CC) -c $(ALL_CFLAGS) \ -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c