[Libreoffice-commits] .: 2 commits - icc/SampleICC-1.3.2.patch openssl/makefile.mk openssl/openssl.patch

[Tor Lillqvist]

 icc/SampleICC-1.3.2.patch |   16 ++++++++++++++++
 openssl/makefile.mk       |    9 +++++++--
 openssl/openssl.patch     |   23 +++++++++++++++++------
 3 files changed, 40 insertions(+), 8 deletions(-)

New commits:
commit 2716bc3e6a8c0dad4d48773cb02e9c0e88db787b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jan 24 01:19:29 2011 +0200

    Use MSVC settings not just on x86

diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
index 581b8e3..e6ab79c 100644
--- a/icc/SampleICC-1.3.2.patch
+++ b/icc/SampleICC-1.3.2.patch
@@ -1373,6 +1373,22 @@
 *** misc/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Mon Aug 20 22:05:00 2007
 --- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	Fri Jan 25 14:23:09 2008
 ***************
+*** 87,93 ****
+  #endif
+  
+  //PC, visual C++
+! #if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)
+  
+    //Define how 64 bit integers are represented
+    #define ICCUINT64 unsigned __int64
+--- 87,93 ----
+  #endif
+  
+  //PC, visual C++
+! #if defined(_MSC_VER) && !defined(__MWERKS__)
+  
+    //Define how 64 bit integers are represented
+    #define ICCUINT64 unsigned __int64
 *** 107,126 ****
   
   #else // non-PC, perhaps Mac or Linux
commit d3f62767c9bae351d4fe010a4880a8f8c5f8aadd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jan 23 18:49:49 2011 +0200

    Fix OpenSSL build for x64 Windows
    
    For wntmscx, pass the platform code as VC-WIN64A to the OpenSSL build
    mechanism. Add the additional steps described in INSTALL.W64 to
    do_ms.bat: generate uptable.asm and assemble it. Avoid a problem with
    _vsnprintf by defining _CRT_NON_CONFORMING_SWPRINTFS.

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 9bd5d50..d5efcf7 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -152,8 +152,13 @@ OUT2BIN += out/libeay32.dll
 
         #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
         CONFIGURE_ACTION=$(PERL) configure
-        CONFIGURE_FLAGS=VC-WIN32 no-idea
-        BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
+.IF "$(CPU") == "I"
+        OPENSSL_PLATFORM=VC-WIN32
+.ELSE
+        OPENSSL_PLATFORM=VC-WIN64A
+.ENDIF
+        CONFIGURE_FLAGS=$(OPENSSL_PLATFORM) no-idea
+        BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL))) $(OPENSSL_PLATFORM)" && nmake -f ms/ntdll.mak
 
         OUT2LIB = out32dll$/ssleay32.lib
         OUT2LIB += out32dll$/libeay32.lib
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index 5d245f4..88f7088 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -28,14 +28,16 @@
 -perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
 -perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
 +%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
- if x%OSVERSION% == x goto skipce
++if %2 == VC-WIN32 goto not64a
++perl ms\uplink.pl win64a > ms\uptable.asm
++ml64 -c -Foms\uptable.obj ms\uptable.asm
++:not64a
++%1 util\mk1mf.pl no-asm %2 >ms\nt.mak
++%1 util\mk1mf.pl dll no-asm %2 >ms\ntdll.mak
+-if x%OSVERSION% == x goto skipce
 -perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
 -perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
-+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
- :skipce
+-:skipce
  
 -perl util\mkdef.pl 32 libeay > ms\libeay32.def
 -perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
@@ -132,3 +134,12 @@
  
  sub do_lib_rule
  	{
+--- misc/build/openssl-0.9.8o/ms/uplink.c
++++ misc/build/openssl-0.9.8o/ms/uplink.c
+@@ -1,5 +1,6 @@
+ #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE)
+ #define UNICODE
++#define _CRT_NON_CONFORMING_SWPRINTFS
+ #endif
+ #if defined(UNICODE) && !defined(_UNICODE)
+ #define _UNICODE