[oe-commits] Chen Qi : libsm: remove dependency on e2fsprogs
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 29 15:37:12 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 5e7d6f40149be69a3e3b17b28ce3f687a93b40fa
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5e7d6f40149be69a3e3b17b28ce3f687a93b40fa
Author: Chen Qi <Qi.Chen at windriver.com>
Date: Tue Dec 30 17:11:57 2014 +0800
libsm: remove dependency on e2fsprogs
This patch is to solve the following circular dependency problem.
systemd -> dbus -> libsm -> e2fsprogs -> util-linux -> systemd
libsm doesn't have any dependency on e2fsprogs. It might be some dependency
on util-linux's libuuid, controlled by configure options. So e2fsprogs should
be removed from the DEPENDS variable.
Ideally, we should add a PACKAGECONFIG for 'libuuid' for libsm. However, if
libsm depends on util-linux, we would have the circular dependency described
above. That's why this patch explicitly set '--without-libuuid' in EXTRA_OECONF.
libsm would still be working well because it would fall back to an internal
algorithm to do the uuid stuff.
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
index 180acfa..1925136 100644
--- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
@@ -11,7 +11,12 @@ require xorg-lib-common.inc
LICENSE = "MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d"
-DEPENDS += "libice xproto xtrans e2fsprogs"
+DEPENDS += "libice xproto xtrans"
+
+# libSM can work without libuuid, we explicitly disable it to break the following circular dependency
+# when DISTRO_FEATURES contains 'systemd' and 'x11'.
+# systemd -> dbus -> libsm -> util-linux -> systemd
+EXTRA_OECONF += "--without-libuuid"
PE = "1"
More information about the Openembedded-commits
mailing list