[vlc-devel] [PATCH 1/1] contribs: qt: prevent Qt from creating libtool files

[Marvin Scholz]

On 12 Nov 2019, at 13:31, Alexandre Janniaux wrote:

> Hi,
>
> Pinging for the patch,
>
> Regards,

LGTM, thanks!

> --
> Alexandre Janniaux
> Videolabs
>
> On Sun, Jul 28, 2019 at 02:59:20PM +0200, Alexandre Janniaux wrote:
>> These files are generated but never used by Qt. They prevent libtool 
>> in
>> VLC from using pkg-config files, which would lead to misconfiguration 
>> issues,
>> especially in cross-compilation build.
>>
>> The create_libtool config option is currently only set for unix 
>> builds, but
>> setting -create_libtool in the .prf file will prevent every other qt 
>> contribs to
>> generate libtool files too.
>> ---
>>  contrib/src/qt/rules.mak | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
>> index 03327edc19..69ff7600af 100644
>> --- a/contrib/src/qt/rules.mak
>> +++ b/contrib/src/qt/rules.mak
>> @@ -101,6 +101,8 @@ endif
>>  ENV_VARS := $(HOSTVARS) DXSDK_DIR=$(PREFIX)/bin
>>
>>  .qt: qt
>> +	# Prevent all Qt contribs from generating and installing libtool 
>> .la files
>> +	cd $< && sed -i "/CONFIG/ s/ create_libtool/ -create_libtool/g" 
>> mkspecs/features/qt_module.prf
>>  	cd $< && $(ENV_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) 
>> -prefix $(PREFIX) -I $(PREFIX)/include
>>  	# Make && Install libraries
>>  	cd $< && $(ENV_VARS) $(MAKE)
>> --
>> 2.22.0
>>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel