04a9801510
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one platform tests the patchs applying on all platforms ubsan.patch.0 was effectively applied upstream while need to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build under windows Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15183 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
21 lines
779 B
Groff
21 lines
779 B
Groff
--- openssl.org/util/pl/VC-32.pl 2014-05-18 23:41:39.336594400 +0200
|
|
+++ openssl/util/pl/VC-32.pl 2014-05-18 23:47:40.055279300 +0200
|
|
@@ -48,7 +48,7 @@
|
|
my $f = $shlib || $fips ?' /MD':' /MT';
|
|
$opt_cflags=$f.' /Ox';
|
|
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
|
|
- $lflags="/nologo /subsystem:console /opt:ref";
|
|
+ $lflags="/nologo /subsystem:console,5.02 /opt:ref";
|
|
|
|
*::perlasm_compile_target = sub {
|
|
my ($target,$source,$bname)=@_;
|
|
@@ -135,7 +135,7 @@
|
|
$ff = "/fixed";
|
|
$opt_cflags=$f.' -Ox -O2 -Ob2';
|
|
$dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
|
|
- $lflags="/nologo /subsystem:console /opt:ref";
|
|
+ $lflags="/nologo /subsystem:console,5.01 /opt:ref";
|
|
}
|
|
$lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
|
|
$mlflags='';
|