[vlc-devel] [PATCH] contrib: fix protobuf build on Android

[Thomas Guillem]

Yes, you're right, I'm still trying to understand the vlc build system...
The fix belongs to the android port.

On Wed, Oct 1, 2014 at 6:24 PM, Rémi Denis-Courmont <remi at remlab.net> wrote:
> Le mercredi 1 octobre 2014, 18:09:09 Thomas Guillem a écrit :
>> ---
>>  contrib/src/protobuf/rules.mak | 9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
>> index 9fbd339..dbc2338 100644
>> --- a/contrib/src/protobuf/rules.mak
>> +++ b/contrib/src/protobuf/rules.mak
>> @@ -7,6 +7,13 @@ ifeq ($(call need_pkg,"protobuf"),)
>>  PKGS_FOUND += protobuf
>>  endif
>>
>> +ifdef HAVE_ANDROID
>> +HOSTVARS_EXTRA := \
>> +     LIBS="$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/$(GCCVER)/libs/$(ANDROI
>> D_ABI)/libgnustl_static.a" +else
>> +HOSTVARS_EXTRA :=
>> +endif
>> +
>
> That clobbers the environment, no thanks. Besides, I don't see why this
> belongs here; how is C++ toolchain stuff specific to protobuf anyway?
>
>>  $(TARBALLS)/protobuf-$(PROTOBUF_VERSION).tar.bz2:
>>       $(call download,$(PROTOBUF_URL))
>>
>> @@ -28,6 +35,6 @@ ifdef HAVE_CROSS_COMPILE
>>       cd $< && ./configure --prefix="$(PREFIX)" && $(MAKE) install
>>       cd $< && $(MAKE) clean
>>  endif
>> -     cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-protoc=protoc
>> +     cd $< && $(HOSTVARS) $(HOSTVARS_EXTRA) ./configure $(HOSTCONF)
>> --with-protoc=protoc cd $< && $(MAKE) install
>>       touch $@
>
> --
> Rémi Denis-Courmont
> http://www.remlab.net/
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel