From 5be92d4f0677c9191159fee541990e1bf77823f9 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 24 Dec 2012 13:28:39 +0200 Subject: xserver-xorg: enable multilib [YOCTO #3438] (From OE-Core rev: 4c49e76b793bd80422d7b9566d218ca7d087905b) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/xorg-xserver') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 7331cf6..5d5443c 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")) -- cgit v1.1