linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2310
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2010-11-27 20:32:56 +0100
message:
  openssl msvc build fixes
modified:
  openssl/build/build.bat
  openssl/build/patch.patch


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'openssl/build/build.bat'
--- openssl/build/build.bat	2010-11-21 19:11:21 +0000
+++ openssl/build/build.bat	2010-11-27 19:32:56 +0000
@@ -46,11 +46,12 @@
 if errorlevel 1 goto end
 mv inc32/openssl/opensslconf.h ../../include/openssl/opensslconf-msvc-x86.h
 mv inc32/openssl/* ../../include/openssl
-mv out32/libeay32.lib out32/ssleay32.lib ../../lib
+mv lib/libeay32.lib lib/ssleay32.lib tmp32/lib.pdb ../../lib
 nmake -f ms\ntdebug.mak clean install
 if errorlevel 1 goto end
-mv out32.dbg/libeay32.lib ../../lib/libeay32d.lib
-mv out32.dbg/ssleay32.lib ../../lib/ssleay32d.lib
+mv lib/libeay32.lib ../../lib/libeay32d.lib
+mv lib/ssleay32.lib ../../lib/ssleay32d.lib
+mv tmp32.dbg/libd.pdb ../../lib
 cd ..
 
 rm -rf */
@@ -64,11 +65,12 @@
 nmake -f ms\nt.mak clean install
 if errorlevel 1 goto end
 mv inc32/openssl/opensslconf.h ../../include/openssl/opensslconf-msvc-x64.h
-mv out32/libeay32.lib out32/ssleay32.lib ../../lib/x64
+mv lib/libeay32.lib lib/ssleay32.lib tmp32/lib.pdb ../../lib/x64
 nmake -f ms\ntdebug.mak clean install
 if errorlevel 1 goto end
-mv out32.dbg/libeay32.lib ../../lib/x64/libeay32d.lib
-mv out32.dbg/ssleay32.lib ../../lib/x64/ssleay32d.lib
+mv lib/libeay32.lib ../../lib/x64/libeay32d.lib
+mv lib/ssleay32.lib ../../lib/x64/ssleay32d.lib
+mv tmp32.dbg/libd.pdb ../../lib/x64
 cd ..
 
 rm -rf */

=== modified file 'openssl/build/patch.patch'
--- openssl/build/patch.patch	2010-11-23 18:24:00 +0000
+++ openssl/build/patch.patch	2010-11-27 19:32:56 +0000
@@ -1,21 +1,6 @@
 diff -ru old/Configure new/Configure
 --- old/Configure	2008-09-18 14:56:10.000000000 +0200
 +++ new/Configure	2009-03-10 23:48:48.034829900 +0100
-@@ -491,12 +491,12 @@
- #
- # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
- "VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
--"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
-+"VC-WIN64A","cl:/DEBUG /W3 /Gs0 /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
- "debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
- "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
- # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
- # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
--"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
-+"VC-WIN32","cl:/DEBUG /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
- # Unified CE target
- "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
- "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
 @@ -505,7 +505,7 @@
  "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
  
@@ -83,3 +68,11 @@
  
  $zlib_lib="zlib1.lib";
  
+@@ -140,6 +140,7 @@
+ # generate symbols.pdb unconditionally
+ $app_cflag.=" /Zi /Fd\$(TMP_D)/app";
+ $lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
++if ($debug) { $lib_cflag.="d"; }
+ $lflags.=" /debug";
+ 
+ $obj='.obj';