git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Petr Baudis <pasky@suse.cz>, Jon Seymour <jon.seymour@gmail.com>
Cc: Linus Torvalds <torvalds@osdl.org>, git@vger.kernel.org
Subject: [PATCH] Under NO_OPENSSL -lssl should not be used
Date: Fri, 29 Jul 2005 22:02:24 -0700	[thread overview]
Message-ID: <7vek9g6g4f.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0507292038160.29650@g5.osdl.org> (Linus Torvalds's message of "Fri, 29 Jul 2005 20:39:56 -0700 (PDT)")

Linus Torvalds <torvalds@osdl.org> 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):
>
>   torvalds@shell0:~/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 <junkio@cox.net>
---
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

  parent reply	other threads:[~2005-07-30  5:03 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-29  8:58 [PATCH 0/2] Bits from git-pb Petr Baudis
2005-07-29  9:00 ` [PATCH 1/2] Trivial tidyups Petr Baudis
2005-07-29  9:01 ` [PATCH 2/2] Unify usage strings declaration Petr Baudis
2005-07-30  2:11   ` Junio C Hamano
2005-07-30  6:03     ` Matthias Urlichs
2005-07-29 12:53 ` [PATCH 3/2] git-merge-cache -q doesn't complain about failing merge program Petr Baudis
2005-07-30  2:11   ` Junio C Hamano
2005-07-29 15:48 ` [PATCH 4/2] Improve the compilation-time settings interface Petr Baudis
2005-07-29 18:23   ` Petr Baudis
2005-07-29 15:48 ` [PATCH 5/2] Remove the explicit Makefile dependencies description Petr Baudis
2005-07-29 15:50 ` [PATCH 6/2] Reorder Makefile rules Petr Baudis
2005-07-29 15:50 ` [PATCH 7/2] Support for NO_OPENSSL Petr Baudis
2005-07-30  3:39   ` Linus Torvalds
2005-07-30  4:17     ` Junio C Hamano
2005-07-30  5:02     ` Junio C Hamano [this message]
2005-07-30 16:09       ` [PATCH] Under NO_OPENSSL -lssl should not be used Linus Torvalds
2005-08-02 22:43       ` Jon Seymour
2005-07-29 17:21 ` [PATCH 8/2] Build commands through object files Petr Baudis
2005-07-30 10:31 ` [PATCH 0/2] Bits from git-pb Petr Baudis
2005-07-30 17:33   ` Junio C Hamano
2005-07-30 17:59     ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=7vek9g6g4f.fsf_-_@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=jon.seymour@gmail.com \
    --cc=pasky@suse.cz \
    --cc=torvalds@osdl.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).