[FFmpeg-devel] [PATCH]: configure: correct pkgconfig to reflect --build-suffix

[Måns Rullgård]

"Charles Yates" <charles.yates at gmail.com> writes:

> 2008/11/12 Diego Biurrun <diego at biurrun.de>
>
>> On Mon, Nov 10, 2008 at 09:25:30PM +0100, Charles Yates wrote:
>> >
>> > The attached patch attempts to reflect the build suffix in the generated
>> > pkg-config files.
>> >
>>
>> This is pointless.  If you are using $build_suffix everywhere
>> unconditionally, there is no need to pass it as a parameter.
>
> Fair enough - alternative patch with global use of build_suffix attached.
> Original intention of the patch was to avoid the reliance on a global -
> agreed though, it's simpler this way :-).
>
> Also catches the uninstalled case which the previous patch missed (though it
> was wrong before and wrong now - if you configure --disable-static you still
> get Libs: ${libdir}/libavblah.a in the *-uninstalled.pc files).
>
> Cheers,
>
> Charlie
>
> Index: configure
> ===================================================================
> --- configure	(revision 15807)
> +++ configure	(working copy)
> @@ -2346,11 +2346,11 @@
>  
>  pkgconfig_generate(){
>  name=$1
> -shortname=${name#lib}
>  comment=$2
>  version=$3
>  libs=$4
>  requires=$5
> +shortname=${name#lib}${buid_suffix}

Why did you move that line?

>  cat <<EOF > $name/$name.pc
>  prefix=$prefix
>  exec_prefix=\${prefix}
> @@ -2378,7 +2378,7 @@
>  Version: $version
>  Requires: $requires
>  Conflicts:
> -Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
> +Libs: \${libdir}/${LIBPREF}${shortname}${buid_suffix}${LIBSUF} $libs

Adding ${build_suffix} twice seems wrong.

-- 
M?ns Rullg?rd
mans at mansr.com