[OE-core] [PATCH] xorgproto: Install .pc files in ${libdir}/pkgconfig

[Burton, Ross]

Send the patch in to oe-core with Upstream-Status: Submitted, and
hopefully we can drop it shortly.

Ross

On 13 June 2018 at 15:32, Jeremy A. Puhlman <jpuhlman at mvista.com> wrote:
> Okay I did some test builds and nuking the libdir lines worked fine.
>
> The patch is submitted here:
> https://lists.x.org/archives/xorg-devel/2018-June/057123.html
>
> It wasn't rejected out of hand. Did you want me to roll a update to this
> with the submitted
> patch, or did you want to wait to see how it pays out on the x-org list?
>
>
> On 6/11/2018 9:35 AM, Burton, Ross wrote:
>>
>> I'd recommend deleting the libdir lines in every .pc file (and pushing
>> the patch upstream).
>>
>> Ross
>>
>> On 11 June 2018 at 17:19, Jeremy A. Puhlman <jpuhlman at mvista.com> wrote:
>>>
>>>
>>> On 6/11/2018 3:23 AM, Burton, Ross wrote:
>>>>
>>>> Upstream will (and do) argue that $datadir is the right location as
>>>> these headers are architecture-independent.
>>>>
>>>> Would the package manager do the right thing if the files didn't have
>>>> the libdir line in, so where bit-identical?
>>>
>>>
>>> Yes, if the files are binary identical then the package manager would not
>>> call it a conflict.
>>>
>>>
>>>> Ross
>>>>
>>>> On 10 June 2018 at 20:01, Jeremy Puhlman <jpuhlman at mvista.com> wrote:
>>>>>
>>>>> * --data dir config option is only used to install pkgconfig
>>>>> * Installing into ${datadir} causes mutlilib conficts on install
>>>>>
>>>>>     file /usr/share/pkgconfig/applewmproto.pc conflicts between
>>>>> attempted
>>>>> installs of lib32-xorgproto-dev-2018.4-r0.i586 and
>>>>> xorgproto-dev-2018.4-r0.corei7_64
>>>>>     file /usr/share/pkgconfig/bigreqsproto.pc conflicts between
>>>>> attempted
>>>>> installs of lib32-xorgproto-dev-2018.4-r0.i586 and
>>>>> xorgproto-dev-2018.4-r0.corei7_64
>>>>>
>>>>> and so on.
>>>>>
>>>>> Signed-off-by: Jeremy Puhlman <jpuhlman at mvista.com>
>>>>> ---
>>>>>    meta/recipes-graphics/xorg-proto/xorg-proto-common.inc | 2 +-
>>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
>>>>> b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
>>>>> index 7a417c9..7377283 100644
>>>>> --- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
>>>>> +++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
>>>>> @@ -14,7 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
>>>>>    DEPENDS = "util-macros"
>>>>>
>>>>>    inherit autotools pkgconfig
>>>>> -EXTRA_OECONF = "--without-fop"
>>>>> +EXTRA_OECONF = "--without-fop --datadir=${libdir}"
>>>>>
>>>>>    UNKNOWN_CONFIGURE_WHITELIST += "--without-fop --without-xmlto
>>>>> --with-xmlto"
>>>>>
>>>>> --
>>>>> 2.6.2
>>>>>
>>>>> --
>>>>> _______________________________________________
>>>>> Openembedded-core mailing list
>>>>> Openembedded-core at lists.openembedded.org
>>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>
>>>
>>> --
>>> Jeremy A. Puhlman
>>> jpuhlman at mvista.com
>>>
>
> --
> Jeremy A. Puhlman
> jpuhlman at mvista.com
>