[OE-core] [PATCH 1/6] systemd: build with compatibility libraries

[Joshua Lock]

On 20/10/15 04:23, Khem Raj wrote:
>
>> On Oct 16, 2015, at 8:51 AM, Joshua Lock <joshua.lock at collabora.co.uk> wrote:
>>
>> There are recipes in the Core metadata that have optional systemd
>> support but expect the old, separate, libsystemd-foo pkg-config files
>> (not the newer unified libsystemd).
>>
>> Add a PACKAGECONFIG option to build systemd with the compatibility
>> pc files and default to enabling this option so that we can make use of
>> them in the weston recipe.
>>
>> Signed-off-by: Joshua Lock <joshua.lock at collabora.co.uk>
>> ---
>> meta/recipes-core/systemd/systemd_225.bb | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
>> index c2dad58..594c5aa 100644
>> --- a/meta/recipes-core/systemd/systemd_225.bb
>> +++ b/meta/recipes-core/systemd/systemd_225.bb
>> @@ -58,7 +58,7 @@ LDFLAGS_append_libc-uclibc = " -lrt"
>>
>> GTKDOC_DOCDIR = "${S}/docs/"
>>
>> -PACKAGECONFIG ??= "xz ldconfig \
>> +PACKAGECONFIG ??= "xz ldconfig compat \
>>                     ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
>>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
>>                     ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
>> @@ -89,6 +89,7 @@ PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
>> PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
>> PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind"
>> PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode"
>> +PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs”
>
> I would rather expect this to not be there in first place, if its needed for some, then lets not enable it by default
> what would it take to fix weston ?

Very little effort, it seems - the backport for Weston is trivial.

I'll prepare a v2 series where this PACKAGECONFIG is added but not 
enabled by default and add an extra change to backport the weston 
configure.ac update for the new libsystemd pkg-config.

Regards,

Joshua