git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: msysgit@googlegroups.com,
	"Erik Faye-Lund" <kusmabite@googlemail.com>,
	git@vger.kernel.org, "Erik Faye-Lund" <kusmabite@gmail.com>,
	Junio C Hamano <gitster@pobox.com>,
	"Marius Storm-Olsen" <mstormo@gmail.com>
Subject: [PATCH ef/msys-imap] mingw: use BLK_SHA1 again
Date: Thu, 22 Oct 2009 20:26:29 +0200	[thread overview]
Message-ID: <200910222026.29885.j6t@kdbg.org> (raw)
In-Reply-To: <200910222011.02737.j6t@kdbg.org>

Since NO_OPENSSL is no longer defined on Windows, BLK_SHA1 is not defined
anymore implicitly. Define it explicitly.

As a nice side-effect, we no longer link against libcrypto.dll, which has
non-trivial startup costs because it depends on 6 otherwise unneeded
DLLs.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
On Donnerstag, 22. Oktober 2009, Johannes Sixt wrote:
> ... and I have one more patch to be applied on top of the series.

Here it is. I haven't tested the MSVC aspect of the patch. I would
appreciate feedback in this regard.

-- Hannes

 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 5403fad..f666d2f 100644
--- a/Makefile
+++ b/Makefile
@@ -911,6 +911,7 @@ ifdef MSVC
 	NO_REGEX = YesPlease
 	NO_CURL = YesPlease
 	NO_PTHREADS = YesPlease
+	BLK_SHA1 = YesPlease
 
 	CC = compat/vcbuild/scripts/clink.pl
 	AR = compat/vcbuild/scripts/lib.pl
@@ -960,6 +961,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	UNRELIABLE_FSTAT = UnfortunatelyYes
 	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
 	NO_REGEX = YesPlease
+	BLK_SHA1 = YesPlease
 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o
-- 
1.6.5.rc3.70.gfc1aa

  reply	other threads:[~2009-10-22 18:26 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-21 17:04 [PATCH v5 0/8] imap-send: Windows support Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 1/8] imap-send: remove useless uid code Erik Faye-Lund
2009-10-21 17:04   ` [PATCH v5 2/8] imap-send: use separate read and write fds Erik Faye-Lund
2009-10-21 17:04     ` [PATCH v5 3/8] imap-send: use run-command API for tunneling Erik Faye-Lund
2009-10-21 17:04       ` [PATCH v5 4/8] imap-send: fix compilation-error on Windows Erik Faye-Lund
2009-10-21 17:04         ` [PATCH v5 5/8] imap-send: build imap-send " Erik Faye-Lund
2009-10-21 17:04           ` [PATCH v5 6/8] mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle Erik Faye-Lund
2009-10-21 17:04             ` [PATCH v5 7/8] mingw: enable OpenSSL Erik Faye-Lund
2009-10-21 17:04               ` [PATCH v5 8/8] MSVC: Enable OpenSSL, and translate -lcrypto Erik Faye-Lund
2009-10-22 18:38               ` [msysGit] [PATCH v5 7/8] mingw: enable OpenSSL Johannes Sixt
2009-10-22 17:42 ` [msysGit] [PATCH v5 0/8] imap-send: Windows support Johannes Schindelin
2009-10-22 18:11   ` [msysGit] " Johannes Sixt
2009-10-22 18:26     ` Johannes Sixt [this message]
2009-10-26 22:26       ` [PATCH ef/msys-imap] mingw: use BLK_SHA1 again Johannes Schindelin
2009-10-27  6:56         ` Johannes Sixt
2009-10-22 19:20     ` [msysGit] Re: [PATCH v5 0/8] imap-send: Windows support 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

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

  git send-email \
    --in-reply-to=200910222026.29885.j6t@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kusmabite@gmail.com \
    --cc=kusmabite@googlemail.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).