threads / patch / 4059

patchFix linking with OpenSSL

Subject: [PATCH] Fix linking with OpenSSL

## tl;dr

5 messages between May 4, 2006 and May 5, 2006. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Alexey Dobriyan· May 4, 2006, 22:25 UTC · lore
For those who put it into interesting (read: default) place.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Show changes to Makefile +1 −1
--- 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) \
Junio C Hamano· May 4, 2006, 22:38 UTC · re: Alexey Dobriyan · lore

Re: [PATCH] Fix linking with OpenSSL

Alexey Dobriyan <adobriyan@gmail.com> writes:
Show 15 quoted lines
> 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?
Junio C Hamano· May 4, 2006, 23:00 UTC · re: Junio C Hamano · lore

Re: [PATCH] Fix linking with OpenSSL

Junio C Hamano <junkio@cox.net> writes:
Show 25 quoted lines
> 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 --
Show changes to Makefile +0 −4
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
Alexey Dobriyan· May 5, 2006, 07:57 UTC · re: Junio C Hamano · lore

Re: [PATCH] Fix linking with OpenSSL

On Thu, May 04, 2006 at 04:00:26PM -0700, Junio C Hamano wrote:
Show 27 quoted lines
> 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?
It does. It also crashes busybox patch applet. Oh, well...
Show 13 quoted lines
> --- 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

← back to recent threads