[vlc-devel] [vlc-commits] contribs/gnutls: disable on iOS

[David Fuhrmann]

Am 31.12.2013 um 15:44 schrieb Felix Paul Kühne <fkuehne at videolan.org>:

> Hey David,
> 
> On 30.12.2013, at 23:30, David Fuhrmann <git at videolan.org> wrote:
> 
>> vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Dec 30 23:11:01 2013 +0100| [e453aec19f4dd03246ff551a1a4b50a812044ddd] | committer: David Fuhrmann
>> 
>> contribs/gnutls: disable on iOS
>> 
>>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e453aec19f4dd03246ff551a1a4b50a812044ddd
>> ---
>> 
>> contrib/src/gnutls/rules.mak |    2 ++
>> 1 file changed, 2 insertions(+)
>> 
>> diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
>> index bad9509..b63d616 100644
>> --- a/contrib/src/gnutls/rules.mak
>> +++ b/contrib/src/gnutls/rules.mak
>> @@ -4,8 +4,10 @@ GNUTLS_VERSION := 3.1.17
>> GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
>> 
>> ifdef BUILD_NETWORK
>> +ifndef HAVE_IOS
>> PKGS += gnutls
>> endif
>> +endif
>> ifeq ($(call need_pkg,"gnutls >= 3.0.20"),)
>> PKGS_FOUND += gnutls
>> endif
> 
> This is actually not sufficient as nettle (and in turn gmp) are still being compiled then. Instead of cluttering /contrib further, I'll just disable gnutls from within extras/package/ios, which is cleaner and a single line only.
> 
> So if you don't oppose, I'll revert this commit.

Hi Felix,

I tried out my patch before within 2.1 tree, and it worked. It looks like you made a mistake in backporting (if you do a manual --enable-gnutls it will also try to build that)?

IMO the contrib system should only build the libraries which are supported (and working). Not everyone may find you additional build scripts and will wonder why contrib build is failing.

With best regards,
David