[vlc-devel] [PATCH] contrib: modplug: Fix endianness check

[Steve Lhomme]

LGTM

On 2019-10-11 12:47, Marvin Scholz wrote:
> The autoconf endianness check does not compile with a C++ compiler
> due to bogus casts, therefore it is needed to use the C compiler to
> check for the host endianness.
> 
> This fixes the libmodplug contrib build for Android.
> ---
>   contrib/src/modplug/fix-endianness-check.diff | 12 ++++++++++++
>   contrib/src/modplug/rules.mak                 |  1 +
>   2 files changed, 13 insertions(+)
>   create mode 100644 contrib/src/modplug/fix-endianness-check.diff
> 
> diff --git a/contrib/src/modplug/fix-endianness-check.diff b/contrib/src/modplug/fix-endianness-check.diff
> new file mode 100644
> index 0000000000..b880f51c98
> --- /dev/null
> +++ b/contrib/src/modplug/fix-endianness-check.diff
> @@ -0,0 +1,12 @@
> +--- ./configure.ac.orig	2019-10-11 12:40:29.000000000 +0200
> ++++ ./configure.ac	2019-10-11 12:40:50.000000000 +0200
> +@@ -21,7 +21,9 @@ AC_DISABLE_STATIC([])
> + AC_PROG_CC
> + AC_PROG_CXX
> + AC_LANG([C++])
> ++AC_LANG_PUSH([C])
> + AC_C_BIGENDIAN
> ++AC_LANG_POP([C])
> +
> + #AC_LIBTOOL_WIN32_DLL
> + #AC_PROG_LIBTOOL
> diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
> index d511f42c73..6776bfbbe6 100644
> --- a/contrib/src/modplug/rules.mak
> +++ b/contrib/src/modplug/rules.mak
> @@ -17,6 +17,7 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
>   	$(UNPACK)
>   	$(APPLY) $(SRC)/modplug/modplug-win32-static.patch
>   	$(APPLY) $(SRC)/modplug/macosx-do-not-force-min-version.patch
> +	$(APPLY) $(SRC)/modplug/fix-endianness-check.diff
>   	$(call pkg_static,"libmodplug.pc.in")
>   	$(MOVE)
>   
> -- 
> 2.20.1 (Apple Git-117)
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>