[vlc-devel] [PATCH 3/5] package/win32: build.sh: don't force the PKG_CONFIG_LIBDIR

[Steve Lhomme]

On 2020-02-15 23:54, Marvin Scholz wrote:
> Hi,
> 
> I am not sure what you are trying to fix here so maybe you can elaborate?
> 
> I believe this patch would break the build for me, using an unprefixed
> pkg-config?

The contribs now take care of detecting the working pkg-config for the 
target. So we don't need to force one locally.

The one used to compile VLC match the one used for the contribs.

> On 14 Feb 2020, at 13:37, Steve Lhomme wrote:
> 
>> The contrib path is automatically added for contribs and for vlc.
>>
>> We still need it for VLC as it uses the autotools detection which 
>> fails to
>> realise TRIPLET-pkg-config exists, runs but is not functional on Debian.
>> ---
>>  extras/package/win32/build.sh | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/extras/package/win32/build.sh 
>> b/extras/package/win32/build.sh
>> index 6d782adf0dc..b3533dcdf34 100755
>> --- a/extras/package/win32/build.sh
>> +++ b/extras/package/win32/build.sh
>> @@ -138,7 +138,6 @@ fi
>>  cd ../../
>>
>>  export USE_FFMPEG=1
>> -export PKG_CONFIG_LIBDIR="$PWD/contrib/$TRIPLET/lib/pkgconfig"
>>  export PATH="$PWD/contrib/$TRIPLET/bin":"$PATH"
>>
>>  if [ "$INTERACTIVE" = "yes" ]; then
>> @@ -182,6 +181,8 @@ fi
>>  cd ../..
>>
>>  info "Bootstrapping"
>> +# make sure the Debian TRIPLET-pkg-config doesn't pretend it works to 
>> autoconf
> 
> Hmm I don’t understand what this comment is trying to say at all, maybe 
> you can
> formulate it in another way or elaborate? I am quite confused.

New comment (in latest patchset):
# On Debian x86_64-w64-mingw32-pkg-config exists, runs but returns an 
error when checking packages

>> +export PKG_CONFIG_LIBDIR=""
>>
>>  ${SCRIPT_PATH}/../../../bootstrap
>>
>> -- 
>> 2.17.1
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel