diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:38:45 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 14:38:45 +0000 |
commit | a9278f2e1cb7db649ae53025023a80e6ecaa9f3f (patch) | |
tree | c5d2c4b7a6bf2cc8b0d789b0165d4bcedfab0bd6 /openssl | |
parent | INTEGRATION: CWS nowrapcmd1 (1.21.2); FILE MERGED (diff) | |
download | core-a9278f2e1cb7db649ae53025023a80e6ecaa9f3f.tar.gz core-a9278f2e1cb7db649ae53025023a80e6ecaa9f3f.zip |
INTEGRATION: CWS nowrapcmd1 (1.2.2); FILE MERGED
2007/12/04 17:57:00 vq 1.2.2.1: #i82202#, #i84084# Fix openssl build issue for nowrapcmd1 and 4NT builds.
Diffstat (limited to 'openssl')
-rw-r--r-- | openssl/openssl.patch | 238 |
1 files changed, 152 insertions, 86 deletions
diff --git a/openssl/openssl.patch b/openssl/openssl.patch index b77308fd83ae..bc6f971c5bbc 100644 --- a/openssl/openssl.patch +++ b/openssl/openssl.patch @@ -1,86 +1,152 @@ ---- misc/build/openssl-0.9.8e/ms/do_ms.bat 2005-05-17 02:07:13.000000000 +0200 -+++ misc/build/openssl-0.9.8e/ms/do_ms.bat 2007-08-23 15:04:58.218750000 +0200 -@@ -1,9 +1,8 @@ -+%1 util\mkfiles.pl >MINFO -+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak -+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak -+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak -+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak - --perl util\mkfiles.pl >MINFO --perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak --perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak --perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak --perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak -- --perl util\mkdef.pl 32 libeay > ms\libeay32.def --perl util\mkdef.pl 32 ssleay > ms\ssleay32.def -+%1 util\mkdef.pl 32 libeay > ms\libeay32.def -+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def ---- misc/build/openssl-0.9.8e/util/mk1mf.pl 2006-11-30 14:04:43.000000000 +0100 -+++ misc/build/openssl-0.9.8e/util/mk1mf.pl 2007-10-02 09:12:46.343750000 +0200 -@@ -115,7 +115,7 @@ - $inc_def="outinc"; - $tmp_def="tmp"; - --$perl="perl" unless defined $perl; -+$perl="$ENV{PERL}" unless defined $perl; - $mkdir="-mkdir" unless defined $mkdir; - - ($ssl,$crypto)=("ssl","crypto"); - ---- misc/build/openssl-0.9.8e/util/pl/VC-32.pl 2006-01-15 14:46:20.000000000 +0100 -+++ misc/build/openssl-0.9.8e/util/pl/VC-32.pl 2007-11-21 10:05:05.156250000 +0100 -@@ -14,7 +14,7 @@ - $zlib_lib="zlib1.lib"; - - # C compiler stuff --$cc='cl'; -+$cc=$ENV{'CC'}; - if ($FLAVOR =~ /WIN64/) - { - # Note that we currently don't have /WX on Win64! There is a lot of -@@ -83,19 +83,19 @@ - } - - $cc='$(CC)'; -- $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; -+ $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; - $base_cflags.=" $wcecdefs"; -- $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... -- $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; -+ $opt_cflags=' -MC -O1i'; # optimize for space, but with intrinsics... -+ $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG'; - $lflags="/nologo /opt:ref $wcelflag"; - } - else # Win32 - { -- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; -+ $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; - $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 - $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 -- $opt_cflags=' /MD /Ox /O2 /Ob2'; -- $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG'; -+ $opt_cflags=' -MD -Ox -O2 -Ob2'; -+ $dbg_cflags=' -MDd -Od -DDEBUG -D_DEBUG'; - $lflags="/nologo /subsystem:console /opt:ref"; - } - $mlflags=''; -@@ -116,7 +116,7 @@ - } - - $obj='.obj'; --$ofile="/Fo"; -+$ofile="-Fo.\\"; - - # EXE linking stuff - $link="link"; -@@ -234,7 +234,7 @@ - $tmp_def='tmp32dll_$(TARGETCPU)'; - } - --$cflags.=" /Fd$out_def"; -+$cflags.=" -Fd$out_def"; - - sub do_lib_rule - { +*** misc/openssl-0.9.8e/ms/do_ms.bat Tue May 17 02:07:13 2005 +--- misc/build/openssl-0.9.8e/ms/do_ms.bat Fri Nov 30 16:18:49 2007 +*************** +*** 1,9 **** +! +! perl util\mkfiles.pl >MINFO +! perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak +! perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak +! perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak +! perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak +! +! perl util\mkdef.pl 32 libeay > ms\libeay32.def +! perl util\mkdef.pl 32 ssleay > ms\ssleay32.def +--- 1,8 ---- +! %1 util\mkfiles.pl >MINFO +! %1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak +! %1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak +! %1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak +! %1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak +! +! %1 util\mkdef.pl 32 libeay > ms\libeay32.def +! %1 util\mkdef.pl 32 ssleay > ms\ssleay32.def +*** misc/openssl-0.9.8e/util/mk1mf.pl Thu Nov 30 14:04:43 2006 +--- misc/build/openssl-0.9.8e/util/mk1mf.pl Fri Nov 30 16:19:19 2007 +*************** +*** 115,121 **** + $inc_def="outinc"; + $tmp_def="tmp"; + +! $perl="perl" unless defined $perl; + $mkdir="-mkdir" unless defined $mkdir; + + ($ssl,$crypto)=("ssl","crypto"); +--- 115,121 ---- + $inc_def="outinc"; + $tmp_def="tmp"; + +! $perl="$ENV{PERL}" unless defined $perl; + $mkdir="-mkdir" unless defined $mkdir; + + ($ssl,$crypto)=("ssl","crypto"); +*************** +*** 566,572 **** + printf OUT <<EOF; + #ifdef $platform_cpp_symbol + /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */ +! #define CFLAGS "$cc $cflags" + #define PLATFORM "$platform" + EOF + printf OUT " #define DATE \"%s\"\n", scalar gmtime(); +--- 566,572 ---- + printf OUT <<EOF; + #ifdef $platform_cpp_symbol + /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */ +! #define CFLAGS "$cflags" + #define PLATFORM "$platform" + EOF + printf OUT " #define DATE \"%s\"\n", scalar gmtime(); +*** misc/openssl-0.9.8e/util/pl/VC-32.pl Sun Jan 15 14:46:20 2006 +--- misc/build/openssl-0.9.8e/util/pl/VC-32.pl Fri Nov 30 16:18:49 2007 +*************** +*** 14,20 **** + $zlib_lib="zlib1.lib"; + + # C compiler stuff +! $cc='cl'; + if ($FLAVOR =~ /WIN64/) + { + # Note that we currently don't have /WX on Win64! There is a lot of +--- 14,20 ---- + $zlib_lib="zlib1.lib"; + + # C compiler stuff +! $cc=$ENV{'CC'}; + if ($FLAVOR =~ /WIN64/) + { + # Note that we currently don't have /WX on Win64! There is a lot of +*************** +*** 83,101 **** + } + + $cc='$(CC)'; +! $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; + $base_cflags.=" $wcecdefs"; +! $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... +! $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /opt:ref $wcelflag"; + } + else # Win32 + { +! $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; + $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 + $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 +! $opt_cflags=' /MD /Ox /O2 /Ob2'; +! $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /subsystem:console /opt:ref"; + } + $mlflags=''; +--- 83,101 ---- + } + + $cc='$(CC)'; +! $base_cflags=' -W3 -WX -GF -Gy -nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT'; + $base_cflags.=" $wcecdefs"; +! $opt_cflags=' -MC -O1i'; # optimize for space, but with intrinsics... +! $dbg_clfags=' -MC -Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /opt:ref $wcelflag"; + } + else # Win32 + { +! $base_cflags=' -W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32'; + $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8 + $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 +! $opt_cflags=' -MD -Ox -O2 -Ob2'; +! $dbg_cflags=' -MDd -Od -DDEBUG -D_DEBUG'; + $lflags="/nologo /subsystem:console /opt:ref"; + } + $mlflags=''; +*************** +*** 116,122 **** + } + + $obj='.obj'; +! $ofile="/Fo"; + + # EXE linking stuff + $link="link"; +--- 116,122 ---- + } + + $obj='.obj'; +! $ofile="-Fo.\\"; + + # EXE linking stuff + $link="link"; +*************** +*** 234,240 **** + $tmp_def='tmp32dll_$(TARGETCPU)'; + } + +! $cflags.=" /Fd$out_def"; + + sub do_lib_rule + { +--- 234,240 ---- + $tmp_def='tmp32dll_$(TARGETCPU)'; + } + +! $cflags.=" -Fd$out_def"; + + sub do_lib_rule + { |