From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] Fix linking with OpenSSL Date: Thu, 04 May 2006 16:00:26 -0700 Message-ID: <7vslnp2y5x.fsf@assigned-by-dhcp.cox.net> References: <20060504222550.GA7236@mipter.zuzino.mipt.ru> <7vwtd12z6h.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri May 05 01:00:46 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FbmoB-0003j9-El for gcvg-git@gmane.org; Fri, 05 May 2006 01:00:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751525AbWEDXA2 (ORCPT ); Thu, 4 May 2006 19:00:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932348AbWEDXA2 (ORCPT ); Thu, 4 May 2006 19:00:28 -0400 Received: from fed1rmmtao01.cox.net ([68.230.241.38]:33709 "EHLO fed1rmmtao01.cox.net") by vger.kernel.org with ESMTP id S1751524AbWEDXA2 (ORCPT ); Thu, 4 May 2006 19:00:28 -0400 Received: from assigned-by-dhcp.cox.net ([68.4.9.127]) by fed1rmmtao01.cox.net (InterMail vM.6.01.06.01 201-2131-130-101-20060113) with ESMTP id <20060504230027.DAD25692.fed1rmmtao01.cox.net@assigned-by-dhcp.cox.net>; Thu, 4 May 2006 19:00:27 -0400 To: Alexey Dobriyan In-Reply-To: <7vwtd12z6h.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Thu, 04 May 2006 15:38:30 -0700") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: 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