From 596b42f7d69be49558f9c791c952c9b669f80949 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Mon, 14 Apr 2014 11:25:36 +0200 Subject: [PATCH] systemd: add option to enable compatibility libs Since systemd 209, some libraries have been merged into libsystemd.so: - libsystemd-daemon.so - libsystemd-id128.so - libsystemd-journal.so - libsystemd-login.so A new configuration menu entry has been added to enable the installation of compatibility pkg-config files, so that programs that depend on them can still be built. [Thomas: as suggested by Yann during the review, add an else clause with --disable-compat-libs.] Signed-off-by: Eric Le Bihan Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 13 +++++++++++++ package/systemd/systemd.mk | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 095fee0336..f10637af70 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -92,4 +92,17 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD http://www.freedesktop.org/software/systemd/man/systemd-networkd.html +config BR2_PACKAGE_SYSTEMD_COMPAT + bool "enable compatibility libraries" + help + Since systemd 209, the following libraries have been merged into + libsystemd.so: + + - libsystemd-daemon + - libsystemd-id128 + - libsystemd-journal + - libsystemd-login + + This option enables the installation of compatibility *.pc files. + endif diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index ecedfced97..f7661abb8c 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,6 +46,12 @@ SYSTEMD_CONF_OPT += \ --disable-dbus \ --without-python +ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y) +SYSTEMD_CONF_OPT += --enable-compat-libs +else +SYSTEMD_CONF_OPT += --disable-compat-libs +endif + ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_CONF_OPT += --enable-acl SYSTEMD_DEPENDENCIES += acl -- 2.30.2