[vlc-commits] contrib/harfbuzz: work-around build system stupidity breaking clang compilation

[Felix Paul Kühne]

vlc/vlc-2.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Mar 12 14:48:12 2014 +0100| [8ea8e2aaf82d030c21b2e4697f1ac4f5b13c97aa] | committer: Jean-Baptiste Kempf

contrib/harfbuzz: work-around build system stupidity breaking clang compilation

(cherry picked from commit 4588b01c03fe8c62048cad31a894cbf9fe09c65d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8ea8e2aaf82d030c21b2e4697f1ac4f5b13c97aa
---

 contrib/src/harfbuzz/harfbuzz-clang.patch |   16 ++++++++++++++++
 contrib/src/harfbuzz/rules.mak            |    1 +
 2 files changed, 17 insertions(+)

diff --git a/contrib/src/harfbuzz/harfbuzz-clang.patch b/contrib/src/harfbuzz/harfbuzz-clang.patch
new file mode 100644
index 0000000..59d1e06
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-clang.patch
@@ -0,0 +1,16 @@
+--- harfbuzz/configure.ac	2013-07-16 22:04:08.000000000 +0200
++++ harfbuzz/configure.ac	2014-03-12 14:46:36.000000000 +0100
+@@ -80,13 +80,6 @@
+ 			CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+ 		;;
+ 	esac
+-
+-	case "$host" in
+-		arm-*-*)
+-			# Request byte alignment on arm
+-			CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
+-		;;
+-	esac
+ fi
+ 
+ AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index c6a84a6..e9ea233 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -16,6 +16,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(UNPACK)
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
+	$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
 	$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)