[vlc-devel] [vlc-commits] contrib: sqlite: don't build the shell exe

Steve Lhomme robux4 at ycbcr.xyz
Thu Apr 30 14:56:56 CEST 2020


On 2020-04-30 14:51, Hugo Beauzée-Luyssen wrote:
> On Thu, Apr 30, 2020, at 12:09 PM, Steve Lhomme wrote:
>> vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Apr  8
>> 14:15:35 2020 +0200| [3ed5f875bb28eecfc761252f33d326e65f56a908] |
>> committer: Steve Lhomme
>>
>> contrib: sqlite: don't build the shell exe
>>
>> We don't need it and it doesn't build with winstore.
>>
>>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3ed5f875bb28eecfc761252f33d326e65f56a908
>> ---
>>
>>   contrib/src/sqlite/rules.mak | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/contrib/src/sqlite/rules.mak b/contrib/src/sqlite/rules.mak
>> index e6564abca4..2696ca54a1 100644
>> --- a/contrib/src/sqlite/rules.mak
>> +++ b/contrib/src/sqlite/rules.mak
>> @@ -28,5 +28,5 @@ sqlite: sqlite-autoconf-$(SQLITE_VERSION).tar.gz .sum-sqlite
>>   
>>   .sqlite: sqlite
>>   	cd $< && $(HOSTVARS) CFLAGS="$(SQLITE_CFLAGS)" ./configure $(SQLITE_CONF)
>> -	cd $< && $(MAKE) && $(MAKE) install
>> +	cd $< && $(MAKE) install-libLTLIBRARIES
>>   	touch $@
>>
>> _______________________________________________
>> vlc-commits mailing list
>> vlc-commits at videolan.org
>> https://mailman.videolan.org/listinfo/vlc-commits
>>
> 
> Hi,
> 
> I very much realize that I suggested that change instead of patching the Makefile, but it seems I forgot to clean by contrib prefix when testing it... This doesn't appear to install the headers nor the .pc file, causing the medialibrary build to fail when looking for sqlite.
> 
> Adding "make install-data" appears to solve the issue, but maybe we should just revert back to your first patch...

OK, you can revert and push a better fix.
I'm testing locally.


More information about the vlc-devel mailing list