[vlc-devel] [PATCH] contrib: don't build iconv on win32 if it's found on the system

[Rémi Denis-Courmont]

iconv executable on the build machine says nothing of the target, AFAIK.

Le 4 octobre 2018 14:02:12 GMT+03:00, Steve Lhomme <robux4 at ycbcr.xyz> a écrit :
>---
> contrib/src/iconv/rules.mak | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
>index c998fd81fc6..665eab04c12 100644
>--- a/contrib/src/iconv/rules.mak
>+++ b/contrib/src/iconv/rules.mak
>@@ -7,6 +7,10 @@ PKGS += iconv
> # Hard-code based on the operating system.
> ifndef HAVE_WIN32
> PKGS_FOUND += iconv
>+else
>+ifeq ($(call $(shell iconv --version || echo 1)),)
>+PKGS_FOUND += iconv
>+endif
> endif
> 
> $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
>-- 
>2.17.1
>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20181004/74656e93/attachment.html>