[Libreoffice-commits] core.git: 2 commits - external/icu external/lpsolve external/python3 odk/qa

[Michael Stahl]

 external/icu/ExternalProject_icu.mk               |    2 +-
 external/lpsolve/lp_solve_5.5-windows.patch       |    2 +-
 external/python3/python-msvc-disable-sse2.patch.1 |   11 +++++++++++
 odk/qa/checkapi/checkapi.cxx                      |    5 +++++
 4 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit c79d2dbe3a75e3376a5997444b6a3a5f947da107
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 3 00:54:12 2014 +0100

    fdo#82430: MSVC build: disable a few more cases of SSE2 in externals
    
    Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 8d59edf..d302a7c 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -22,7 +22,7 @@ ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,icu,build) :
 	$(call gb_ExternalProject_run,build,\
 		export LIB="$(ILIB)" \
-		&& CFLAGS="-arch:SSE $(SOLARINC) $(gb_DEBUG_CFLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC) $(gb_DEBUG_CFLAGS)" \
+		&& CFLAGS="-arch:SSE $(SOLARINC) $(gb_DEBUG_CFLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-arch:SSE $(SOLARINC) $(gb_DEBUG_CFLAGS)" \
 			INSTALL=`cygpath -m /usr/bin/install` \
 			./runConfigureICU \
 			$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \
diff --git a/external/lpsolve/lp_solve_5.5-windows.patch b/external/lpsolve/lp_solve_5.5-windows.patch
index 70fb553..368c90d 100644
--- a/external/lpsolve/lp_solve_5.5-windows.patch
+++ b/external/lpsolve/lp_solve_5.5-windows.patch
@@ -46,7 +46,7 @@
 -rc lpsolve.rc
 +rc %SOLARINC% lpsolve.rc
 -%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -arch:SSE -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
 -rem /link /LINK50COMPAT
 -
 -if exist a.obj del a.obj
diff --git a/external/python3/python-msvc-disable-sse2.patch.1 b/external/python3/python-msvc-disable-sse2.patch.1
index a01423f..399aa60 100644
--- a/external/python3/python-msvc-disable-sse2.patch.1
+++ b/external/python3/python-msvc-disable-sse2.patch.1
@@ -10,3 +10,14 @@ fdo#82430 disable SSE2 default of MSVC2012
      </ClCompile>
    </ItemDefinitionGroup>
    <ItemGroup>
+--- python3/PCbuild/make_buildinfo.c.orig	2014-11-03 00:48:58.841000000 +0100
++++ python3/PCbuild/make_buildinfo.c	2014-11-03 00:49:16.266200000 +0100
+@@ -109,7 +109,7 @@
+ 
+ int main(int argc, char*argv[])
+ {
+-    char command[CMD_SIZE] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
++    char command[CMD_SIZE] = "cl.exe -arch:SSE -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
+     char tmppath[CMD_SIZE] = "";
+     int do_unlink, result;
+     char *tmpdir = NULL;
commit fa836cab8d3a300e196c7f1b0990098567f7cd62
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 3 23:14:11 2014 +0100

    odk: disable MSVC warning C4996
    
    Change-Id: I6c2dab3b427121366bb2d39b95262311286ae371

diff --git a/odk/qa/checkapi/checkapi.cxx b/odk/qa/checkapi/checkapi.cxx
index 29ec390..67e11c6 100644
--- a/odk/qa/checkapi/checkapi.cxx
+++ b/odk/qa/checkapi/checkapi.cxx
@@ -29,6 +29,11 @@
 // This module contains no tests, this is for the build system.
 #include <cppunit/plugin/TestPlugIn.h>
 
+#ifdef _MSC_VER
+// deprecation warnings do not matter here
+#pragma warning (disable : 4996)
+#endif
+
 #include "allheaders.hxx"
 
 CPPUNIT_PLUGIN_IMPLEMENT();