![Please Enable Javascript]()
{"schema":"libjg2-1",
"vpath":"/git/",
"avatar":"/git/avatar/",
"alang":"",
"gen_ut":1766013648,
"reponame":"openssl",
"desc":"OpenSSL",
"owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl",
"f":3,
"items": [
{"schema":"libjg2-1",
"cid":"8858eaafda41ec27837d9f48af17419d",
"commit": {"type":"commit",
"time": 1520695595,
"time_ofs": 60,
"oid_tree": { "oid": "18538463e413b1298bbf5520dacacb8ded7f283e", "alias": []},
"oid":{ "oid": "78a50c7524e86137e4db3d57d1a06eb573b26054", "alias": []},
"msg": "Configurations/10-main.conf: VC-\u003ctarget\u003e cleanups.",
"sig_commit": { "git_time": { "time": 1520695595, "offset": 60 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" },
"sig_author": { "git_time": { "time": 1520612886, "offset": 60 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" }},
"body": "Configurations/10-main.conf: VC-\u003ctarget\u003e cleanups.\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/5574)\n"
,
"diff": "diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf\nindex a1837ca..c074bd6 100644\n--- a/Configurations/00-base-templates.conf\n+++ b/Configurations/00-base-templates.conf\n@@ -109,6 +109,15 @@ my %targets\u003d(\n inherit_from \u003d\u003e [ \u0022BASE_common\u0022 ],\n template \u003d\u003e 1,\n \n+ lib_defines \u003d\u003e\n+ sub {\n+ my @defs \u003d ();\n+ unless ($disabled{\u0022zlib-dynamic\u0022}) {\n+ my $zlib \u003d $withargs{zlib_lib} // \u0022ZLIB1\u0022;\n+ push @defs, quotify(\u0022perl\u0022, 'LIBZ\u003d\u0022' . $zlib . '\u0022');\n+ }\n+ return [ @defs ];\n+ },\n ex_libs \u003d\u003e\n sub {\n unless ($disabled{zlib}) {\ndiff --git a/Configurations/10-main.conf b/Configurations/10-main.conf\nindex 6b57549..0407a81 100644\n--- a/Configurations/10-main.conf\n+++ b/Configurations/10-main.conf\n@@ -13,7 +13,7 @@ sub vc_win64a_info {\n } elsif ($disabled{asm}) {\n # assembler is still used to compile uplink shim\n $vc_win64a_info \u003d { AS \u003d\u003e \u0022ml64\u0022,\n- ASFLAGS \u003d\u003e \u0022/Zi\u0022,\n+ ASFLAGS \u003d\u003e \u0022/nologo /Zi\u0022,\n asflags \u003d\u003e \u0022/c /Cp /Cx\u0022,\n asoutflag \u003d\u003e \u0022/Fo\u0022 };\n } else {\n@@ -1346,46 +1346,45 @@ my %targets \u003d (\n \n #### Visual C targets\n #\n-# Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64\n+# Win64 targets, WIN64I denotes IA-64/Itanium and WIN64A - AMD64\n #\n-# Note about -wd4090, disable warning C4090. This warning returns false\n+# Note about /wd4090, disable warning C4090. This warning returns false\n # positives in some situations. Disabling it altogether masks both\n # legitimate and false cases, but as we compile on multiple platforms,\n # we rely on other compilers to catch legitimate cases.\n #\n # Also note that we force threads no matter what. Configuring \u0022no-threads\u0022\n # is ignored.\n+#\n+# UNICODE is defined in VC-common and applies to all targets. It used to\n+# be an opt-in option for VC-WIN32, but not anymore. The original reason\n+# was because ANSI API was *native* system interface for no longer\n+# supported Windows 9x. Keep in mind that UNICODE only affects how\n+# OpenSSL libraries interact with underlying OS, it doesn't affect API\n+# that OpenSSL presents to application.\n+\n \u0022VC-common\u0022 \u003d\u003e {\n inherit_from \u003d\u003e [ \u0022BASE_Windows\u0022 ],\n template \u003d\u003e 1,\n CC \u003d\u003e \u0022cl\u0022,\n CPP \u003d\u003e '$(CC) /EP /C',\n- CFLAGS \u003d\u003e \u0022-W3 -wd4090 -nologo\u0022,\n+ CFLAGS \u003d\u003e \u0022/W3 /wd4090 /nologo\u0022,\n LDFLAGS \u003d\u003e add(\u0022/debug\u0022),\n coutflag \u003d\u003e \u0022/Fo\u0022,\n- cflags \u003d\u003e '-Gs0 -GF -Gy',\n defines \u003d\u003e add(\u0022OPENSSL_SYS_WIN32\u0022, \u0022WIN32_LEAN_AND_MEAN\u0022,\n+ \u0022UNICODE\u0022, \u0022_UNICODE\u0022,\n \u0022_CRT_SECURE_NO_DEPRECATE\u0022,\n \u0022_WINSOCK_DEPRECATED_NO_WARNINGS\u0022),\n- lib_cflags \u003d\u003e add(\u0022/Zi /Fdossl_static\u0022),\n- lib_defines \u003d\u003e add([ \u0022L_ENDIAN\u0022 ],\n- sub { my @defs \u003d ();\n- unless ($disabled{\u0022zlib-dynamic\u0022}) {\n- my $zlib \u003d\n- $withargs{zlib_lib} // \u0022ZLIB1\u0022;\n- push @defs,\n- quotify(\u0022perl\u0022,\n- 'LIBZ\u003d\u0022' . $zlib . '\u0022');\n- }\n- return [ @defs ];\n- }),\n- dso_cflags \u003d\u003e \u0022/Zi /Fddso\u0022,\n- bin_cflags \u003d\u003e \u0022/Zi /Fdapp\u0022,\n+ lib_cflags \u003d\u003e add(\u0022/Zi /Fdossl_static.pdb\u0022),\n+ lib_defines \u003d\u003e add(\u0022L_ENDIAN\u0022),\n+ dso_cflags \u003d\u003e \u0022/Zi /Fddso.pdb\u0022,\n+ bin_cflags \u003d\u003e \u0022/Zi /Fdapp.pdb\u0022,\n shared_ldflag \u003d\u003e \u0022/dll\u0022,\n shared_target \u003d\u003e \u0022win-shared\u0022, # meaningless except it gives Configure a hint\n thread_scheme \u003d\u003e \u0022winthreads\u0022,\n dso_scheme \u003d\u003e \u0022win32\u0022,\n apps_aux_src \u003d\u003e add(\u0022win32_init.c\u0022),\n+ bn_ops \u003d\u003e \u0022EXPORT_VAR_AS_FN\u0022,\n # additional parameter to build_scheme denotes install-path \u0022flavour\u0022\n build_scheme \u003d\u003e add(\u0022VC-common\u0022, { separator \u003d\u003e undef }),\n },\n@@ -1394,7 +1393,8 @@ my %targets \u003d (\n template \u003d\u003e 1,\n CFLAGS \u003d\u003e add(picker(debug \u003d\u003e '/Od',\n release \u003d\u003e '/O2')),\n- cflags \u003d\u003e add(picker(debug \u003d\u003e\n+ cflags \u003d\u003e add(picker(default \u003d\u003e '/Gs0 /GF /Gy',\n+ debug \u003d\u003e\n sub {\n ($disabled{shared} ? \u0022\u0022 : \u0022/MDd\u0022);\n },\n@@ -1402,8 +1402,7 @@ my %targets \u003d (\n sub {\n ($disabled{shared} ? \u0022\u0022 : \u0022/MD\u0022);\n })),\n- defines \u003d\u003e add(picker(default \u003d\u003e [ \u0022UNICODE\u0022, \u0022_UNICODE\u0022 ],\n- debug \u003d\u003e [ \u0022DEBUG\u0022, \u0022_DEBUG\u0022 ])),\n+ defines \u003d\u003e add(picker(debug \u003d\u003e [ \u0022DEBUG\u0022, \u0022_DEBUG\u0022 ])),\n lib_cflags \u003d\u003e add(sub { $disabled{shared} ? \u0022/MT /Zl\u0022 : () }),\n # Following might/should appears controversial, i.e. defining\n # /MDd without evaluating $disabled{shared}. It works in\n@@ -1435,14 +1434,14 @@ my %targets \u003d (\n push @ex_libs, 'bufferoverflowu.lib' if (`cl 2\u003e\u00261` \u003d~ /14\u005c.00\u005c.4[0-9]{4}\u005c./);\n return join(\u0022 \u0022, @_, @ex_libs);\n }),\n- bn_ops \u003d\u003e \u0022SIXTY_FOUR_BIT EXPORT_VAR_AS_FN\u0022,\n+ bn_ops \u003d\u003e add(\u0022SIXTY_FOUR_BIT\u0022),\n },\n \u0022VC-WIN64I\u0022 \u003d\u003e {\n inherit_from \u003d\u003e [ \u0022VC-WIN64-common\u0022, asm(\u0022ia64_asm\u0022),\n sub { $disabled{shared} ? () : \u0022ia64_uplink\u0022 } ],\n AS \u003d\u003e \u0022ias\u0022,\n ASFLAGS \u003d\u003e \u0022-d debug\u0022,\n- asoutflag \u003d\u003e \u0022-o\u0022,\n+ asoutflag \u003d\u003e \u0022-o \u0022,\n sys_id \u003d\u003e \u0022WIN64I\u0022,\n bn_asm_src \u003d\u003e sub { return undef unless @_;\n my $r\u003djoin(\u0022 \u0022,@_); $r\u003d~s|bn-ia64.s|bn_asm.c|; $r; },\n@@ -1463,27 +1462,15 @@ my %targets \u003d (\n multilib \u003d\u003e \u0022-x64\u0022,\n },\n \u0022VC-WIN32\u0022 \u003d\u003e {\n- # x86 Win32 target used to default to ANSI API, but not anymore,\n- # UNICODE is the only option. The original reason for providing\n- # UNICODE as opt-in option was because ANSI API was *native*\n- # system interface for [no longer supported] Windows 9x.\n inherit_from \u003d\u003e [ \u0022VC-noCE-common\u0022, asm(\u0022x86_asm\u0022),\n sub { $disabled{shared} ? () : \u0022uplink_common\u0022 } ],\n- CFLAGS \u003d\u003e add(\u0022-WX\u0022),\n+ CFLAGS \u003d\u003e add(\u0022/WX\u0022),\n AS \u003d\u003e sub { vc_win32_info()-\u003e{AS} },\n ASFLAGS \u003d\u003e sub { vc_win32_info()-\u003e{ASFLAGS} },\n asoutflag \u003d\u003e sub { vc_win32_info()-\u003e{asoutflag} },\n asflags \u003d\u003e sub { vc_win32_info()-\u003e{asflags} },\n- ex_libs \u003d\u003e add(sub {\n- my @ex_libs \u003d ();\n- # WIN32 UNICODE build gets linked with unicows.lib for\n- # backward compatibility with Win9x.\n- push @ex_libs, 'unicows.lib'\n- if (grep { $_ eq \u0022UNICODE\u0022 } @{$user{CPPDEFINES}});\n- return join(\u0022 \u0022, @ex_libs, @_);\n- }),\n sys_id \u003d\u003e \u0022WIN32\u0022,\n- bn_ops \u003d\u003e \u0022BN_LLONG EXPORT_VAR_AS_FN\u0022,\n+ bn_ops \u003d\u003e add(\u0022BN_LLONG\u0022),\n perlasm_scheme \u003d\u003e sub { vc_win32_info()-\u003e{perlasm_scheme} },\n # \u0022WOW\u0022 stands for \u0022Windows on Windows\u0022, and \u0022VC-WOW\u0022 engages\n # some installation path heuristics in windows-makefile.tmpl...\n@@ -1491,14 +1478,8 @@ my %targets \u003d (\n },\n \u0022VC-CE\u0022 \u003d\u003e {\n inherit_from \u003d\u003e [ \u0022VC-common\u0022 ],\n- AS \u003d\u003e \u0022ml\u0022,\n- ASFLAGS \u003d\u003e \u0022/nologo\u0022,\n- asoutflag \u003d\u003e \u0022/Fo\u0022,\n- asflags \u003d\u003e \u0022/Cp /coff /c /Cx /Zi\u0022,\n- CC \u003d\u003e \u0022cl\u0022,\n- CFLAGS \u003d\u003e picker(default \u003d\u003e '/W3 /WX /nologo',\n- debug \u003d\u003e \u0022/Od\u0022,\n- release \u003d\u003e \u0022/O1i\u0022),\n+ CFLAGS \u003d\u003e add(picker(debug \u003d\u003e \u0022/Od\u0022,\n+ release \u003d\u003e \u0022/O1i\u0022)),\n CPPDEFINES \u003d\u003e picker(debug \u003d\u003e [ \u0022DEBUG\u0022, \u0022_DEBUG\u0022 ]),\n LDFLAGS \u003d\u003e add(\u0022/nologo /opt:ref\u0022),\n cflags \u003d\u003e\n@@ -1508,9 +1489,7 @@ my %targets \u003d (\n ? ($disabled{shared} ? \u0022 /MT\u0022 : \u0022 /MD\u0022)\n : \u0022 /MC\u0022; }),\n cppflags \u003d\u003e sub { vc_wince_info()-\u003e{cppflags}; },\n- defines \u003d\u003e [ \u0022WIN32_LEAN_AND_MEAN\u0022 ],\n- lib_defines \u003d\u003e [ \u0022L_ENDIAN\u0022, \u0022DSO_WIN32\u0022, \u0022NO_CHMOD\u0022,\n- \u0022OPENSSL_SMALL_FOOTPRINT\u0022 ],\n+ lib_defines \u003d\u003e add(\u0022NO_CHMOD\u0022, \u0022OPENSSL_SMALL_FOOTPRINT\u0022),\n lib_cppflags \u003d\u003e sub { vc_wince_info()-\u003e{cppflags}; },\n includes \u003d\u003e\n add(combine(sub { defined(env('WCECOMPAT'))\n@@ -1522,7 +1501,7 @@ my %targets \u003d (\n sub { defined(env('PORTSDK_LIBPATH'))\n ? \u0022/entry:mainCRTstartup\u0022 : (); })),\n sys_id \u003d\u003e \u0022WINCE\u0022,\n- bn_ops \u003d\u003e \u0022BN_LLONG EXPORT_VAR_AS_FN\u0022,\n+ bn_ops \u003d\u003e add(\u0022BN_LLONG\u0022),\n ex_libs \u003d\u003e add(sub {\n my @ex_libs \u003d ();\n push @ex_libs, 'ws2.lib' unless $disabled{sock};\n","s":{"c":1766013648,"u": 39211}}
],"g": 42096,"chitpc": 0,"ehitpc": 0,"indexed":0
,
"ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}