git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Erik Faye-Lund <kusmabite@googlemail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, Marius Storm-Olsen <mstormo@gmail.com>,
	Erik Faye-Lund <kusmabite@gmail.com>
Subject: [PATCH v3 8/8] MSVC: Enable OpenSSL, and translate -lcrypto
Date: Tue, 13 Oct 2009 19:25:25 +0000	[thread overview]
Message-ID: <1255461925-2244-9-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1255461925-2244-8-git-send-email-kusmabite@gmail.com>


From: Marius Storm-Olsen <mstormo@gmail.com>

We don't use crypto, but rather require libeay32 and
ssleay32. handle it in both the Makefile msvc linker
script, and the buildsystem generator.

Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
 Makefile                        |    1 -
 compat/vcbuild/scripts/clink.pl |    3 +++
 contrib/buildsystems/engine.pl  |    3 +++
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index e416fdb..b39bed4 100644
--- a/Makefile
+++ b/Makefile
@@ -900,7 +900,6 @@ ifdef MSVC
 	GIT_VERSION := $(GIT_VERSION).MSVC
 	pathsep = ;
 	NO_PREAD = YesPlease
-	NO_OPENSSL = YesPlease
 	NO_LIBGEN_H = YesPlease
 	NO_SYMLINK_HEAD = YesPlease
 	NO_IPV6 = YesPlease
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index f9528c0..8a2112f 100644
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -29,6 +29,9 @@ while (@ARGV) {
 		push(@args, "zlib.lib");
 	} elsif ("$arg" eq "-liconv") {
 		push(@args, "iconv.lib");
+	} elsif ("$arg" eq "-lcrypto") {
+		push(@args, "libeay32.lib");
+		push(@args, "ssleay32.lib");
 	} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
 		$arg =~ s/^-L/-LIBPATH:/;
 		push(@args, $arg);
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 20bd061..d506717 100644
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -315,6 +315,9 @@ sub handleLinkLine
             $appout = shift @parts;
         } elsif ("$part" eq "-lz") {
             push(@libs, "zlib.lib");
+	} elsif ("$part" eq "-lcrypto") {
+            push(@libs, "libeay32.lib");
+            push(@libs, "ssleay32.lib");
         } elsif ($part =~ /^-/) {
             push(@lflags, $part);
         } elsif ($part =~ /\.(a|lib)$/) {
-- 
1.6.4

  reply	other threads:[~2009-10-13 19:27 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-13 19:25 [PATCH v3 0/8] imap-send: Windows support Erik Faye-Lund
2009-10-13 19:25 ` [PATCH v3 1/8] imap-send: remove useless uid code Erik Faye-Lund
2009-10-13 19:25   ` [PATCH v3 2/8] imap-send: use separate read and write fds Erik Faye-Lund
2009-10-13 19:25     ` [PATCH v3 3/8] imap-send: use run-command API for tunneling Erik Faye-Lund
2009-10-13 19:25       ` [PATCH v3 4/8] imap-send: fix compilation-error on Windows Erik Faye-Lund
2009-10-13 19:25         ` [PATCH v3 5/8] imap-send: build imap-send " Erik Faye-Lund
2009-10-13 19:25           ` [PATCH v3 6/8] mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle Erik Faye-Lund
2009-10-13 19:25             ` [PATCH v3 7/8] mingw: enable OpenSSL Erik Faye-Lund
2009-10-13 19:25               ` Erik Faye-Lund [this message]
2009-10-13 19:57           ` [PATCH v3 5/8] imap-send: build imap-send on Windows Johannes Sixt
2009-10-13 20:16             ` Erik Faye-Lund
2009-10-13 21:34               ` Erik Faye-Lund
2009-10-13 19:59       ` [PATCH v3 3/8] imap-send: use run-command API for tunneling Johannes Sixt
2009-10-13 20:27         ` Erik Faye-Lund
2009-10-14 19:58           ` Johannes Sixt
2009-10-16 14:27             ` Erik Faye-Lund

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=1255461925-2244-9-git-send-email-kusmabite@gmail.com \
    --to=kusmabite@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=kusmabite@gmail.com \
    --cc=mstormo@gmail.com \
    --cc=msysgit@googlegroups.com \
    /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;
as well as URLs for NNTP newsgroup(s).