• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8561 (tree)
Zeit2020-02-25 01:39:06
Autorzmatsuo

Log Message

openssl の patch を当てるようにした

- cmake で libs をビルドするとき、従来はパッチせずにビルドしていた
- check_patch.bat の内容と同等

- libs/openssl11.cmake でパッチする
- vs2005.patch を追加 (check_patch.bat で perl で処理している内容)
- opensslのビルドオプジョンを bat と同等にした

Ändern Zusammenfassung

Diff

--- trunk/libs/openssl_patch/vs2005.patch (nonexistent)
+++ trunk/libs/openssl_patch/vs2005.patch (revision 8561)
@@ -0,0 +1,36 @@
1+--- openssl_org\Configurations\10-main.conf.orig 2019-09-10 22:13:07.000000000 +0900
2++++ openssl\Configurations\10-main.conf 2020-02-23 23:50:51.000000000 +0900
3+***************
4+*** 1216,1222 ****
5+ template => 1,
6+ CC => "cl",
7+ CPP => '$(CC) /EP /C',
8+! CFLAGS => "/W3 /wd4090 /nologo",
9+ LDFLAGS => add("/debug"),
10+ coutflag => "/Fo",
11+ defines => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN",
12+--- 1216,1222 ----
13+ template => 1,
14+ CC => "cl",
15+ CPP => '$(CC) /EP /C',
16+! CFLAGS => "/W1 /wd4090 /nologo",
17+ LDFLAGS => add("/debug"),
18+ coutflag => "/Fo",
19+ defines => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN",
20+***************
21+*** 1313,1319 ****
22+ "VC-WIN32" => {
23+ inherit_from => [ "VC-noCE-common", asm("x86_asm"),
24+ sub { $disabled{shared} ? () : "uplink_common" } ],
25+! CFLAGS => add("/WX"),
26+ AS => sub { vc_win32_info()->{AS} },
27+ ASFLAGS => sub { vc_win32_info()->{ASFLAGS} },
28+ asoutflag => sub { vc_win32_info()->{asoutflag} },
29+--- 1313,1319 ----
30+ "VC-WIN32" => {
31+ inherit_from => [ "VC-noCE-common", asm("x86_asm"),
32+ sub { $disabled{shared} ? () : "uplink_common" } ],
33+! CFLAGS => add(""),
34+ AS => sub { vc_win32_info()->{AS} },
35+ ASFLAGS => sub { vc_win32_info()->{ASFLAGS} },
36+ asoutflag => sub { vc_win32_info()->{asoutflag} },
Show on old repository browser