]> code.ossystems Code Review - openembedded-core.git/commitdiff
xorgproto: move pc files to libdir
authorJeremy Puhlman <jpuhlman@mvista.com>
Fri, 28 Feb 2020 23:00:06 +0000 (15:00 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 29 Feb 2020 13:01:29 +0000 (13:01 +0000)
We fixed this two years go:
http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151922.html

However xorgproto moved to meson and uses pkgconfig module to generate the .pc
which does not provide a method of omitting the libdir, which now means any
pc generated from meson using the module will always be mulitlib incompatible.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-graphics/xorg-proto/xorgproto_2019.2.bb

index fb3f3aed3d42ef130f655aa5426475de7bfa819b..c0785ccd643a4f5b405e2806fc80cf087ce6cbaa 100644 (file)
@@ -19,6 +19,8 @@ inherit meson
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false"
 
+# Datadir only used to install pc files, $datadir/pkgconfig
+datadir="${libdir}"
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"