external/icu/ExternalProject_icu.mk | 2 +-
external/lpsolve/lp_solve_5.5-windows.patch | 2 +-
external/python3/python-msvc-disable-sse2.patch.1 | 11 +++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 0fae44a2c9c17d6e3325c7ca2d56d4f90ad539c9
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Nov 3 00:54:12 2014 +0100
fdo#82430: MSVC build: disable a few more cases of SSE2 in externals
(cherry picked from commit c79d2dbe3a75e3376a5997444b6a3a5f947da107)
Conflicts:
external/icu/ExternalProject_icu.mk
Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f
Reviewed-on: https://gerrit.libreoffice.org/12247
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index d565178..addf678 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)" CPPFLAGS="$(SOLARINC)"
CXXFLAGS="$(SOLARINC)" \
+ && CFLAGS="-arch:SSE $(SOLARINC)" CPPFLAGS="$(SOLARINC)"
CXXFLAGS="-arch:SSE $(SOLARINC)" \
./runConfigureICU \
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug
--disable-release) \
Cygwin/MSVC \
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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
