diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-03 00:54:12 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-03 23:23:15 +0100 |
| commit | c79d2dbe3a75e3376a5997444b6a3a5f947da107 (patch) | |
| tree | 3b976c315ecfcfc3b73c64d0edaf954b458a0fb6 /external | |
| parent | fa836cab8d3a300e196c7f1b0990098567f7cd62 (diff) | |
fdo#82430: MSVC build: disable a few more cases of SSE2 in externals
Change-Id: I8f0db23d1f9ba6b9fc3c8b64b32822ba8166428f
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 2 | ||||
| -rw-r--r-- | external/lpsolve/lp_solve_5.5-windows.patch | 2 | ||||
| -rw-r--r-- | external/python3/python-msvc-disable-sse2.patch.1 | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 8d59edf01ac2..d302a7c0949e 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 70fb553fcdc9..368c90d04270 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 a01423fc3287..399aa6016dfc 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; |