* [PATCH] MSVC: Enable OpenSSL, and translate -lcrypto
@ 2009-10-03 20:00 Marius Storm-Olsen
2009-10-03 20:05 ` Erik Faye-Lund
0 siblings, 1 reply; 4+ messages in thread
From: Marius Storm-Olsen @ 2009-10-03 20:00 UTC (permalink / raw)
To: git; +Cc: kusmabite, msysgit
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>
---
Requires Erik Faye-Lund's MinGW patches for imap-send
ontop of git.git master.
This patch was actually sent using the MSVC
git-imap-send.exe to my GMail account.
D:\msvc\git>cat
0001-MSVC-Enable-OpenSSL-and-translate-lcrypto.patch |
git-imap-send.exe
Resolving imap.gmail.com... ok
Connecting to 74.125.79.109:993... ok
Logging in...
sending 1 message
100% (1/1) done
:)
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 8818f0f..c4b91d8 100644
--- a/Makefile
+++ b/Makefile
@@ -881,7 +881,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 0ffd59f..fce1e24 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.3.msysgit.0.18.gef407
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] MSVC: Enable OpenSSL, and translate -lcrypto
2009-10-03 20:00 [PATCH] MSVC: Enable OpenSSL, and translate -lcrypto Marius Storm-Olsen
@ 2009-10-03 20:05 ` Erik Faye-Lund
2009-10-03 20:08 ` Marius Storm-Olsen
0 siblings, 1 reply; 4+ messages in thread
From: Erik Faye-Lund @ 2009-10-03 20:05 UTC (permalink / raw)
To: Marius Storm-Olsen; +Cc: git, msysgit
On Sat, Oct 3, 2009 at 1:00 PM, Marius Storm-Olsen <mstormo@gmail.com> wrote:
> This patch was actually sent using the MSVC
> git-imap-send.exe to my GMail account.
> D:\msvc\git>cat
> 0001-MSVC-Enable-OpenSSL-and-translate-lcrypto.patch |
> git-imap-send.exe
> Resolving imap.gmail.com... ok
> Connecting to 74.125.79.109:993... ok
> Logging in...
> sending 1 message
> 100% (1/1) done
> :)
Awesome :)
> diff --git a/Makefile b/Makefile
> index 8818f0f..c4b91d8 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -881,7 +881,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
Didn't my 7/7 already do this hunk?
--
Erik "kusma" Faye-Lund
kusmabite@gmail.com
(+47) 986 59 656
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] MSVC: Enable OpenSSL, and translate -lcrypto
2009-10-03 20:05 ` Erik Faye-Lund
@ 2009-10-03 20:08 ` Marius Storm-Olsen
2009-10-03 20:17 ` Erik Faye-Lund
0 siblings, 1 reply; 4+ messages in thread
From: Marius Storm-Olsen @ 2009-10-03 20:08 UTC (permalink / raw)
To: Erik Faye-Lund; +Cc: git, msysgit
Erik Faye-Lund said the following on 03.10.2009 22:05:
> On Sat, Oct 3, 2009 at 1:00 PM, Marius Storm-Olsen <mstormo@gmail.com> wrote:
>> This patch was actually sent using the MSVC
>> git-imap-send.exe to my GMail account.
>> D:\msvc\git>cat
>> 0001-MSVC-Enable-OpenSSL-and-translate-lcrypto.patch |
>> git-imap-send.exe
>> Resolving imap.gmail.com... ok
>> Connecting to 74.125.79.109:993... ok
>> Logging in...
>> sending 1 message
>> 100% (1/1) done
>> :)
>
> Awesome :)
Yup, only sad to see that GMail dropped the In-reply-to when sending :-/
>> diff --git a/Makefile b/Makefile
>> index 8818f0f..c4b91d8 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -881,7 +881,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
>
> Didn't my 7/7 already do this hunk?
Not for MSVC. It has it's own section above the MinGW part. Besides, the
-lcrypto 'translation' is critical for it to link.
--
.marius
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] MSVC: Enable OpenSSL, and translate -lcrypto
2009-10-03 20:08 ` Marius Storm-Olsen
@ 2009-10-03 20:17 ` Erik Faye-Lund
0 siblings, 0 replies; 4+ messages in thread
From: Erik Faye-Lund @ 2009-10-03 20:17 UTC (permalink / raw)
To: Marius Storm-Olsen; +Cc: git, msysgit
On Sat, Oct 3, 2009 at 1:08 PM, Marius Storm-Olsen
<marius@storm-olsen.com> wrote:
>> Didn't my 7/7 already do this hunk?
>
> Not for MSVC. It has it's own section above the MinGW part. Besides, the
> -lcrypto 'translation' is critical for it to link.
Ahh, thanks for the clarification :)
--
Erik "kusma" Faye-Lund
kusmabite@gmail.com
(+47) 986 59 656
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-10-03 20:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-03 20:00 [PATCH] MSVC: Enable OpenSSL, and translate -lcrypto Marius Storm-Olsen
2009-10-03 20:05 ` Erik Faye-Lund
2009-10-03 20:08 ` Marius Storm-Olsen
2009-10-03 20:17 ` Erik Faye-Lund
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).