diff options
| author | George Hazan <george.hazan@gmail.com> | 2024-04-19 12:19:04 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2024-04-19 12:19:39 +0300 |
| commit | 932786374e56f39fa7d0ecea29163f30ebb8582a (patch) | |
| tree | b970ae8839c030f441ea4e2df9184de8cc21e7c9 /tools | |
| parent | c17216f6a79994adc290a93846c25c4713754d3e (diff) | |
new version of OpenSSL patch
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/openssl/openssl-mir-changes.patch | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tools/openssl/openssl-mir-changes.patch b/tools/openssl/openssl-mir-changes.patch index 7aaf624f4d..42e1feedbe 100644 --- a/tools/openssl/openssl-mir-changes.patch +++ b/tools/openssl/openssl-mir-changes.patch @@ -1,7 +1,7 @@ -From cb2a5788eb5b86596c2cccb6cec83e5bfb494e5a Mon Sep 17 00:00:00 2001 -From: George Hazan <ghazan@miranda.im> -Date: Mon, 27 Jun 2022 17:42:24 +0300 -Subject: [PATCH] my changes +From 84c2e8cfa4f986d4700a0958cff5e916aea18f38 Mon Sep 17 00:00:00 2001 +From: George Hazan <george.hazan@gmail.com> +Date: Thu, 18 Apr 2024 21:05:16 +0300 +Subject: [PATCH] local changes --- Configurations/00-base-templates.conf | 2 +- @@ -10,51 +10,51 @@ Subject: [PATCH] my changes 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf -index e01dc63a8b..557ee04245 100644 +index 55da5ec56c..90251ca961 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf -@@ -144,7 +144,7 @@ my %targets=( +@@ -152,7 +152,7 @@ my %targets=( + MTFLAGS => "-nologo", mtinflag => "-manifest ", mtoutflag => "-outputresource:", - -- shared_extension => ".dll", +- + shared_extension => ".mir", - build_file => "makefile", build_scheme => [ "unified", "windows" ], + diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index 2fcb96a047..41b8357f4c 100644 +index c9db9aac28..c2c4739a11 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf -@@ -1317,7 +1317,6 @@ my %targets = ( - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, +@@ -1575,7 +1575,6 @@ my %targets = ( + uplink_arch => 'ia64', + asm_arch => 'ia64', perlasm_scheme => "ias", - multilib => "-ia64", }, "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), -@@ -1330,7 +1329,6 @@ my %targets = ( - bn_asm_src => sub { return undef unless @_; - my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; }, - perlasm_scheme => "auto", + inherit_from => [ "VC-WIN64-common" ], +@@ -1587,7 +1586,6 @@ my %targets = ( + uplink_arch => 'x86_64', + asm_arch => 'x86_64', + perlasm_scheme => sub { vc_win64a_info()->{perlasm_scheme} }, - multilib => "-x64", }, "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), + inherit_from => [ "VC-noCE-common" ], diff --git a/util/mkdef.pl b/util/mkdef.pl -index 3ac79821b0..f1c6e24f10 100755 +index 309f908b3e..71b321f536 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl -@@ -1156,7 +1156,7 @@ sub print_def_file - ; Definition file for the DLL version of the $name library from OpenSSL +@@ -300,7 +300,7 @@ sub writer_windows { + ; Definition file for the DLL version of the $libname library from OpenSSL ; --LIBRARY $libname $liboptions -+LIBRARY $libname.mir $liboptions - - EOF +-LIBRARY "$libname" ++LIBRARY "$libname.mir" + EXPORTS + _____ -- -2.36.1.windows.1 +2.44.0.windows.1 |