Linus Torvalds <[EMAIL PROTECTED]> writes:

> This doesn't work at least in the form that Junio merged it (and from 
> what I can tell, he merged your patch as-is):
>
>   [EMAIL PROTECTED]:~/src/git> make NO_OPENSSL=1
>   cc -g -O2 -Wall '-DNO_OPENSSL' '-DSHA1_HEADER="mozilla-sha1/sha1.h"' -o 
> git-rev-list rev-list.o libgit.a -lz -lssl
>   /usr/lib/gcc-lib/i586-suse-linux/3.3.4/../../../../i586-suse-linux/bin/ld: 
> cannot find -lssl
>
> it needs to disable the -lssl too..

Would this be OK?  I think it is ugly but it gets the job done.

Jon, do we really need bignum to do the flow computation?  From
a quick glance, it appears to me that the fraction manipulation
part is quite well isolated.  Do you think adding the support
for using other bignum implementation be reasonable (assuming
you do need to use bignum based fraction)?

------------
This is quick and dirty but under NO_OPENSSL we should not
attempt to link with -lssl (nor -lcrypto).

Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
cd /opt/packrat/playpen/public/in-place/git/git.junio/
jit-diff
# - pu: Fetch from a packed repository on dumb servers.
# + (working tree)
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -108,9 +108,11 @@ LIBS += -lz
 
 ifndef NO_OPENSSL
        LIB_OBJS += epoch.o
+       OPENSSL_LIBSSL=-lssl
 else
        CFLAGS += '-DNO_OPENSSL'
        MOZILLA_SHA1=1
+       OPENSSL_LIBSSL=
 endif
 ifdef MOZILLA_SHA1
   SHA1_HEADER="mozilla-sha1/sha1.h"
@@ -148,7 +150,7 @@ git-ssh-pull: rsh.o pull.o
 git-ssh-push: rsh.o
 
 git-http-pull: LIBS += -lcurl
-git-rev-list: LIBS += -lssl
+git-rev-list: LIBS += $(OPENSSL_LIBSSL)
 
 $(LIB_OBJS): $(LIB_H)
 $(DIFF_OBJS): diffcore.h

Compilation finished at Fri Jul 29 21:48:01

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to