|
|
@@ -0,0 +1,49 @@
|
|
|
+From dad2f7173f30b4ac61b2dcc28104cc6b6167261b Mon Sep 17 00:00:00 2001
|
|
|
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
|
|
|
+Date: Wed, 12 Mar 2014 14:48:12 +0100
|
|
|
+Subject: [PATCH 20/20] contrib/harfbuzz: work-around build system stupidity
|
|
|
+ breaking clang compilation
|
|
|
+
|
|
|
+---
|
|
|
+ contrib/src/harfbuzz/harfbuzz-clang.patch | 16 ++++++++++++++++
|
|
|
+ contrib/src/harfbuzz/rules.mak | 1 +
|
|
|
+ 2 files changed, 17 insertions(+)
|
|
|
+ create mode 100644 contrib/src/harfbuzz/harfbuzz-clang.patch
|
|
|
+
|
|
|
+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 a34ee2b..30e9a2b 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)
|
|
|
+--
|
|
|
+1.8.5.2 (Apple Git-48)
|
|
|
+
|
Felix Paul Kühne