diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-01 23:15:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 17:20:15 +0200 |
| commit | cd42e5f3e2eb9540b16e568559e6e95ffd7cc2a7 (patch) | |
| tree | 9f8901186492d19cc21376566cee3924472e807a /external/coinmp | |
| parent | 37c00bff114fe39e553ea6f1b8e68d6c6ff93eba (diff) | |
fdo#82430: MSVC build: avoid using SSE2 instructions in some externals
Hopefully this should fix up the most important external libraries.
Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
Diffstat (limited to 'external/coinmp')
| -rw-r--r-- | external/coinmp/UnpackedTarball_coinmp.mk | 1 | ||||
| -rw-r--r-- | external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 1dd103a9cebb..ef70c5ca9d1e 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ external/coinmp/no-binaries.patch.1 \ external/coinmp/werror-format-security.patch.0 \ external/coinmp/werror-undef.patch.0 \ + external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \ $(if $(filter MSC,$(COM)),$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \ diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 new file mode 100644 index 000000000000..0f518d6e3512 --- /dev/null +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -0,0 +1,10 @@ +--- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig 2014-10-02 14:22:21.497268171 +0200 ++++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 +@@ -6,6 +6,7 @@ + <ItemDefinitionGroup>
+ <ClCompile>
+ <StringPooling>true</StringPooling>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
|