Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Alexey Dobriyan <adobriyan@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix linking with OpenSSL
Date: Thu, 04 May 2006 16:00:26 -0700	[thread overview]
Message-ID: <7vslnp2y5x.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vwtd12z6h.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Thu, 04 May 2006 15:38:30 -0700")

Junio C Hamano <junkio@cox.net> writes:

> Alexey Dobriyan <adobriyan@gmail.com> writes:
>
>> For those who put it into interesting (read: default) place.
>>
>> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
>>
>> --- 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

  reply	other threads:[~2006-05-04 23:00 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-04 22:25 [PATCH] Fix linking with OpenSSL Alexey Dobriyan
2006-05-04 22:38 ` Junio C Hamano
2006-05-04 23:00   ` Junio C Hamano [this message]
2006-05-05  7:57     ` Alexey Dobriyan
2006-05-05  8:02       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vslnp2y5x.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=adobriyan@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox