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

Jean-Baptiste Kempf jb at videolan.org
Sat Nov 29 14:06:56 CET 2014


LGTM

On 29 Nov, Felix Paul Kühne wrote :
> ---
>  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 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)
> -- 
> 1.9.3 (Apple Git-50)
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device



More information about the vlc-devel mailing list