[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/coinmp external/freetype external/glew external/icu external/lcms2 external/libgltf external/libxml2 external/libxmlsec external/libxslt external/nss external/python3
Michael Stahl
mstahl at redhat.com
Tue Oct 7 02:40:22 PDT 2014
external/coinmp/UnpackedTarball_coinmp.mk | 1
external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 10 +++++++
external/freetype/UnpackedTarball_freetype.mk | 1
external/freetype/freetype-msvc-disable-sse2.patch.1 | 26 +++++++++++++++++++
external/glew/UnpackedTarball_glew.mk | 1
external/glew/glew-msvc-disable-sse2.patch.1 | 10 +++++++
external/icu/ExternalProject_icu.mk | 2 -
external/lcms2/UnpackedTarball_lcms2.mk | 1
external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 10 +++++++
external/libgltf/UnpackedTarball_libgltf.mk | 1
external/libgltf/libgltf-msvc-disable-sse2.patch.1 | 10 +++++++
external/libxml2/libxml2-vc10.patch | 2 -
external/libxmlsec/xmlsec1-vc.patch | 2 -
external/libxslt/libxslt-vc10.patch | 2 -
external/nss/ExternalProject_nss.mk | 2 -
external/python3/UnpackedTarball_python3.mk | 1
external/python3/python-msvc-disable-sse2.patch.1 | 12 ++++++++
17 files changed, 89 insertions(+), 5 deletions(-)
New commits:
commit 44b60234c592164f4ed30a8f00db14f595542d85
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 1 23:15:26 2014 +0200
fdo#82430: MSVC build: avoid using SSE2 instructions in some externals
Hopefully this should fix up the most important external libraries.
(cherry picked from commit cd42e5f3e2eb9540b16e568559e6e95ffd7cc2a7)
Conflicts:
external/coinmp/UnpackedTarball_coinmp.mk
external/icu/ExternalProject_icu.mk
external/lcms2/UnpackedTarball_lcms2.mk
external/python3/UnpackedTarball_python3.mk
Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
Reviewed-on: https://gerrit.libreoffice.org/11769
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index 831f65f..3fdbd78 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/windows.build.patch.1 \
+ external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
))
# vim: set noet sw=4 ts=4:
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 0000000..0f518d6
--- /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 />
diff --git a/external/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk
index 6001851..769d39a 100644
--- a/external/freetype/UnpackedTarball_freetype.mk
+++ b/external/freetype/UnpackedTarball_freetype.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3))
$(eval $(call gb_UnpackedTarball_add_patches,freetype,\
external/freetype/freetype-2.4.8.patch \
+ external/freetype/freetype-msvc-disable-sse2.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/freetype/freetype-msvc-disable-sse2.patch.1 b/external/freetype/freetype-msvc-disable-sse2.patch.1
new file mode 100644
index 0000000..2e4b440
--- /dev/null
+++ b/external/freetype/freetype-msvc-disable-sse2.patch.1
@@ -0,0 +1,26 @@
+--- freetype/builds/win32/vc2010/freetype.vcxproj.orig 2014-10-02 15:41:17.712900843 +0200
++++ freetype/builds/win32/vc2010/freetype.vcxproj 2014-10-02 15:41:59.059897637 +0200
+@@ -105,6 +105,7 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -130,6 +131,7 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -155,6 +157,7 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/external/glew/UnpackedTarball_glew.mk b/external/glew/UnpackedTarball_glew.mk
index 64cbc5c..9d7ba18 100644
--- a/external/glew/UnpackedTarball_glew.mk
+++ b/external/glew/UnpackedTarball_glew.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,glew,\
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_UnpackedTarball_set_patchflags,glew,--binary))
$(eval $(call gb_UnpackedTarball_add_patches,glew,\
+ external/glew/glew-msvc-disable-sse2.patch.1 \
external/glew/glew-fix-rc-error.patch.1 \
))
else
diff --git a/external/glew/glew-msvc-disable-sse2.patch.1 b/external/glew/glew-msvc-disable-sse2.patch.1
new file mode 100644
index 0000000..6b07044
--- /dev/null
+++ b/external/glew/glew-msvc-disable-sse2.patch.1
@@ -0,0 +1,10 @@
+--- glew/build//vc10/common.props.orig 2014-10-02 15:06:57.027060664 +0200
++++ glew/build//vc10/common.props 2014-10-02 15:06:59.026060509 +0200
+@@ -10,6 +10,7 @@
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(INCLUDE_DIR)</AdditionalIncludeDirectories>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 8f1104e..d565178 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="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" \
+ && CFLAGS="-arch:SSE $(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" \
./runConfigureICU \
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \
Cygwin/MSVC \
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk
index b128ba3..2cff6c0 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2.patch \
external/lcms2/lcms2-2.4-windows.patch \
+ external/lcms2/lcms2-msvc-disable-sse2.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 b/external/lcms2/lcms2-msvc-disable-sse2.patch.1
new file mode 100644
index 0000000..37ef773
--- /dev/null
+++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1
@@ -0,0 +1,10 @@
+--- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02 15:15:40.228020086 +0200
++++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02 15:15:42.243019930 +0200
+@@ -133,6 +133,7 @@
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <Optimization>Full</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 176c1d1..749d74a 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
+ external/libgltf/libgltf-msvc-disable-sse2.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/libgltf-msvc-disable-sse2.patch.1 b/external/libgltf/libgltf-msvc-disable-sse2.patch.1
new file mode 100644
index 0000000..4644c89
--- /dev/null
+++ b/external/libgltf/libgltf-msvc-disable-sse2.patch.1
@@ -0,0 +1,10 @@
+--- libgltf/build/win32/libgltf.vcxproj.orig 2014-10-02 15:27:23.057965577 +0200
++++ libgltf/build/win32/libgltf.vcxproj 2014-10-02 15:27:25.845965361 +0200
+@@ -90,6 +90,7 @@
+ <ClCompile>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\inc;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/external/libxml2/libxml2-vc10.patch b/external/libxml2/libxml2-vc10.patch
index 90c4312..f88054e 100644
--- a/external/libxml2/libxml2-vc10.patch
+++ b/external/libxml2/libxml2-vc10.patch
@@ -4,7 +4,7 @@
CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H"
!endif
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
-+CFLAGS = $(CFLAGS) $(SOLARINC)
++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC)
# The linker and its options.
LD = link.exe
diff --git a/external/libxmlsec/xmlsec1-vc.patch b/external/libxmlsec/xmlsec1-vc.patch
index 0898d94..2a0f479 100644
--- a/external/libxmlsec/xmlsec1-vc.patch
+++ b/external/libxmlsec/xmlsec1-vc.patch
@@ -19,7 +19,7 @@
CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
-+CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
+!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
+CFLAGS = $(CFLAGS) /MDd
+!endif
diff --git a/external/libxslt/libxslt-vc10.patch b/external/libxslt/libxslt-vc10.patch
index c82ec84..0a896fa 100644
--- a/external/libxslt/libxslt-vc10.patch
+++ b/external/libxslt/libxslt-vc10.patch
@@ -4,7 +4,7 @@
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
-+CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
++CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
# The linker and its options.
LD = link.exe
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index b7e07f7..8fd1085 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
- XCFLAGS="$(SOLARINC)" \
+ XCFLAGS="-arch:SSE $(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index d6a1d04..5220acda 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.3-py17797.patch.1 \
external/python3/python-3.3.3-msvc2012-winxp.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
+ external/python3/python-msvc-disable-sse2.patch.1 \
))
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-msvc-disable-sse2.patch.1 b/external/python3/python-msvc-disable-sse2.patch.1
new file mode 100644
index 0000000..a01423f
--- /dev/null
+++ b/external/python3/python-msvc-disable-sse2.patch.1
@@ -0,0 +1,12 @@
+fdo#82430 disable SSE2 default of MSVC2012
+
+--- python3/PCbuild/release.props.old 2014-10-01 23:47:33.348095403 +0200
++++ python3/PCbuild/release.props 2014-10-01 23:48:05.051092945 +0200
+@@ -9,6 +9,7 @@
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
More information about the Libreoffice-commits
mailing list