* [PATCH] Fix linking with OpenSSL
@ 2006-05-04 22:25 Alexey Dobriyan
2006-05-04 22:38 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Dobriyan @ 2006-05-04 22:25 UTC (permalink / raw)
To: git
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) \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix linking with OpenSSL
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
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2006-05-04 22:38 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: git
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?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix linking with OpenSSL
2006-05-04 22:38 ` Junio C Hamano
@ 2006-05-04 23:00 ` Junio C Hamano
2006-05-05 7:57 ` Alexey Dobriyan
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2006-05-04 23:00 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: git
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix linking with OpenSSL
2006-05-04 23:00 ` Junio C Hamano
@ 2006-05-05 7:57 ` Alexey Dobriyan
2006-05-05 8:02 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Dobriyan @ 2006-05-05 7:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Thu, May 04, 2006 at 04:00:26PM -0700, Junio C Hamano wrote:
> 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...
> --- 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-05-05 8:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2006-05-05 7:57 ` Alexey Dobriyan
2006-05-05 8:02 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox