summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-24 13:28:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:42:48 +0000
commit4c49e76b793bd80422d7b9566d218ca7d087905b (patch)
treecccd1f228421088893081deecc2176d4964f18da /meta
parentbc4da2573dfb59ea2fc4af359701818df20f7663 (diff)
downloadopenembedded-core-contrib-4c49e76b793bd80422d7b9566d218ca7d087905b.tar.gz
xserver-xorg: enable multilib
[YOCTO #3438] Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 7331cf64dd..5d5443c7db 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
PROVIDES += "virtual/xserver"
PE = "2"
-INC_PR = "r7"
+INC_PR = "r8"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
@@ -151,7 +151,8 @@ python populate_packages_prepend() {
p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
shell=True, env=newenv, stdout=subprocess.PIPE)
output = p.communicate()[0]
- return "xorg-abi-%s-%s" % (name, output.split(".")[0])
+ mlprefix = d.getVar('MLPREFIX', True) or ''
+ return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0])
pn = d.getVar("PN", True)
d.appendVar("RPROVIDES_" + pn, " " + get_abi("input"))