package/dbus: remove empty line from dbus.mk
PATCH 1/2 package/dbus: remove empty line from dbus.mk
--- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-)
package/dbus/dbus.mk +0 -1
@@ -18,7 +18,6 @@ define DBUS_USERS dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user endef - DBUS_DEPENDENCIES = host-pkgconf expat DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
Signature · 1 line
2.6.1
PATCH 2/2 package/dbus: Add optional dependency to xlib_libSM
To detect X11 support dbus uses the autoconf macro AC_PATH_XTRA
http://cgit.freedesktop.org/dbus/dbus/tree/configure.ac#n1264
This macro checks for the optional presence of libICE:
http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob;f=lib/autoconf/libs.m4;h=d2040d731f81fc1693e01d118c45d51ad169d56a;hb=HEAD#l472
quoting dbus configure with libICE not present:
checking for IceConnectionNumber in -lICE... no
quoting dbus configure with libICE being present:
checking for IceConnectionNumber in -lICE... yes
The binary usr/bin/dbus-launch is being linked to libICE and libSM if the packages are available:
$ output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/bin/dbus-launch | grep NEEDED 0x00000001 (NEEDED) Shared library: [libdbus-1.so.3] 0x00000001 (NEEDED) Shared library: [libSM.so.6] 0x00000001 (NEEDED) Shared library: [libICE.so.6] 0x00000001 (NEEDED) Shared library: [libX11.so.6] 0x00000001 (NEEDED) Shared library: [libc.so.1]
To get a reproducable build add libSM as optional dependency to dbus, libSM pulls in the dependency to libICE.
--- package/dbus/dbus.mk | 3 +++ 1 file changed, 3 insertions(+)
package/dbus/dbus.mk +3 -0
@@ -60,6 +60,9 @@ endif ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) DBUS_CONF_OPTS += --with-x DBUS_DEPENDENCIES += xlib_libX11 +ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) +DBUS_DEPENDENCIES += xlib_libSM +endif else DBUS_CONF_OPTS += --without-x endif
Signature · 1 line
2.6.1
PATCH 1/2 package/dbus: remove empty line from dbus.mk
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 4 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>--- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-)
Both applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com