[vlc-commits] contrib: harfbuzz: Pass -mbig-obj to the assembler

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 30 15:31:30 2020 +0200| [459963ce872a725094c78987078f33e4aa1408a7] | committer: Hugo Beauzée-Luyssen

contrib: harfbuzz: Pass -mbig-obj to the assembler

Which fixes non-optimized win64 builds

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=459963ce872a725094c78987078f33e4aa1408a7
---

 ...ists-Enable-big-objects-support-for-win64.patch | 31 ++++++++++++++++++++++
 contrib/src/harfbuzz/rules.mak                     |  1 +
 2 files changed, 32 insertions(+)

diff --git a/contrib/src/harfbuzz/0001-CMakeLists-Enable-big-objects-support-for-win64.patch b/contrib/src/harfbuzz/0001-CMakeLists-Enable-big-objects-support-for-win64.patch
new file mode 100644
index 0000000000..eb0a556b27
--- /dev/null
+++ b/contrib/src/harfbuzz/0001-CMakeLists-Enable-big-objects-support-for-win64.patch
@@ -0,0 +1,31 @@
+From d36fe71173f213307de41711415f56861c71e62c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
+Date: Mon, 30 Mar 2020 16:06:18 +0200
+Subject: [PATCH] CMakeLists: Enable big objects support for win64
+
+---
+ CMakeLists.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2cdfd4b3..6442d9b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -499,6 +499,14 @@ if (UNIX OR MINGW)
+   endif()
+ endif ()
+ 
++if (MINGW)
++  if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
++    CHECK_CXX_COMPILER_FLAG("-Wa,-mbig-obj" COMPILER_SUPPORTS_BIG_OBJ)
++    if (COMPILER_SUPPORTS_BIG_OBJ)
++      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
++    endif()
++  endif()
++endif()
+ 
+ ## Define harfbuzz-gobject library
+ if (HB_HAVE_GOBJECT)
+-- 
+2.20.1
+
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 374a4ff1da..09e7ccc5da 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -21,6 +21,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-coretext-detection.patch
 	#Missing Frameworks in the pkgconfig file
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-create-pkgconfig-file.patch
+	$(APPLY) $(SRC)/harfbuzz/0001-CMakeLists-Enable-big-objects-support-for-win64.patch
 	$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)