Xen project Mailing List

Re: [PATCH] tools: (Actually) drop libsystemd as a dependency

To: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>

From: "Oleksii K." <oleksii.kurochko@xxxxxxxxx>

Date: Thu, 30 May 2024 16:43:12 +0200

Cc: Anthony PERARD <anthony@xxxxxxxxxxxxxx>, Juergen Gross <jgross@xxxxxxxx>, George Dunlap <George.Dunlap@xxxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>

Delivery-date: Thu, 30 May 2024 14:43:22 +0000

List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On Thu, 2024-05-30 at 11:14 +0100, Andrew Cooper wrote: > When reinstating some of systemd.m4 between v1 and v2, I reintroduced > a little > too much. While {c,o}xenstored are indeed no longer linked against > libsystemd, ./configure still looks for it. > > Drop this too. > > Fixes: ae26101f6bfc ("tools: Drop libsystemd as a dependency") > Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx> ~ Oleksii > --- > CC: Anthony PERARD <anthony@xxxxxxxxxxxxxx> > CC: Juergen Gross <jgross@xxxxxxxx> > CC: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx> > CC: George Dunlap <George.Dunlap@xxxxxxxxxx> > CC: Jan Beulich <JBeulich@xxxxxxxx> > CC: Stefano Stabellini <sstabellini@xxxxxxxxxx> > CC: Julien Grall <julien@xxxxxxx> > CC: Roger Pau Monné <roger.pau@xxxxxxxxxx> > > Found when trying to build Xen in XenServer with libsystemd absent > from the > chroot. > --- > m4/systemd.m4 | 8 -- > tools/configure | 229 +--------------------------------------------- > -- > 2 files changed, 1 insertion(+), 236 deletions(-) > > diff --git a/m4/systemd.m4 b/m4/systemd.m4 > index e4fe51a8ba..ab12ea313d 100644 > --- a/m4/systemd.m4 > +++ b/m4/systemd.m4 > @@ -86,13 +86,6 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ > ],[systemd=n]) > ]) > > -AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ > - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], > [systemd="y"],[ > - PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], > - [systemd="y"],[systemd="n"]) > - ]) > -]) > - > dnl Enables systemd by default and requires a --disable-systemd > option flag > dnl to configure if you want to disable. > AC_DEFUN([AX_ENABLE_SYSTEMD], [ > @@ -112,6 +105,5 @@ dnl to have systemd build libraries it will be > enabled. You can always force > dnl disable with --disable-systemd > AC_DEFUN([AX_AVAILABLE_SYSTEMD], [ > AX_ALLOW_SYSTEMD_OPTS() > - AX_CHECK_SYSTEMD_ENABLE_AVAILABLE() > AX_CHECK_SYSTEMD() > ]) > diff --git a/tools/configure b/tools/configure > index b8faa1d520..459bfb5652 100755 > --- a/tools/configure > +++ b/tools/configure > @@ -626,8 +626,6 @@ ac_subst_vars='LTLIBOBJS > LIBOBJS > pvshim > ninepfs > -SYSTEMD_LIBS > -SYSTEMD_CFLAGS > SYSTEMD_MODULES_LOAD > SYSTEMD_DIR > systemd > @@ -864,9 +862,7 @@ pixman_LIBS > libzstd_CFLAGS > libzstd_LIBS > LIBNL3_CFLAGS > -LIBNL3_LIBS > -SYSTEMD_CFLAGS > -SYSTEMD_LIBS' > +LIBNL3_LIBS' > > > # Initialize some variables set by options. > @@ -1621,10 +1617,6 @@ Some influential environment variables: > LIBNL3_CFLAGS > C compiler flags for LIBNL3, overriding pkg-config > LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config > - SYSTEMD_CFLAGS > - C compiler flags for SYSTEMD, overriding pkg-config > - SYSTEMD_LIBS > - linker flags for SYSTEMD, overriding pkg-config > > Use these variables to override the choices made by `configure' or > to help > it to find libraries and programs with nonstandard names/locations. > @@ -3889,8 +3881,6 @@ esac > > > > - > - > > > > @@ -9540,223 +9530,6 @@ fi > > > > - > -pkg_failed=no > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 > -$as_echo_n "checking for SYSTEMD... " >&6; } > - > -if test -n "$SYSTEMD_CFLAGS"; then > - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists > --print-errors \"libsystemd-daemon\""; } >&5 > - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 > - ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > - test $ac_status = 0; }; then > - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" > 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > -else > - pkg_failed=yes > -fi > - else > - pkg_failed=untried > -fi > -if test -n "$SYSTEMD_LIBS"; then > - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists > --print-errors \"libsystemd-daemon\""; } >&5 > - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 > - ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > - test $ac_status = 0; }; then > - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" > 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > -else > - pkg_failed=yes > -fi > - else > - pkg_failed=untried > -fi > - > - > - > -if test $pkg_failed = yes; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > -$as_echo "no" >&6; } > - > -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > - _pkg_short_errors_supported=yes > -else > - _pkg_short_errors_supported=no > -fi > - if test $_pkg_short_errors_supported = yes; then > - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors -- > print-errors --cflags --libs "libsystemd-daemon" 2>&1` > - else > - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors -- > cflags --libs "libsystemd-daemon" 2>&1` > - fi > - # Put the nasty error message in config.log where it belongs > - echo "$SYSTEMD_PKG_ERRORS" >&5 > - > - > - > -pkg_failed=no > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 > -$as_echo_n "checking for SYSTEMD... " >&6; } > - > -if test -n "$SYSTEMD_CFLAGS"; then > - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists > --print-errors \"libsystemd >= 209\""; } >&5 > - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 > - ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > - test $ac_status = 0; }; then > - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" > 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > -else > - pkg_failed=yes > -fi > - else > - pkg_failed=untried > -fi > -if test -n "$SYSTEMD_LIBS"; then > - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists > --print-errors \"libsystemd >= 209\""; } >&5 > - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 > - ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > - test $ac_status = 0; }; then > - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" > 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > -else > - pkg_failed=yes > -fi > - else > - pkg_failed=untried > -fi > - > - > - > -if test $pkg_failed = yes; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > -$as_echo "no" >&6; } > - > -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > - _pkg_short_errors_supported=yes > -else > - _pkg_short_errors_supported=no > -fi > - if test $_pkg_short_errors_supported = yes; then > - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors -- > print-errors --cflags --libs "libsystemd >= 209" 2>&1` > - else > - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors -- > cflags --libs "libsystemd >= 209" 2>&1` > - fi > - # Put the nasty error message in config.log where it belongs > - echo "$SYSTEMD_PKG_ERRORS" >&5 > - > - systemd="n" > -elif test $pkg_failed = untried; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > -$as_echo "no" >&6; } > - systemd="n" > -else > - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS > - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > -$as_echo "yes" >&6; } > - systemd="y" > -fi > - > -elif test $pkg_failed = untried; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > -$as_echo "no" >&6; } > - > - > -pkg_failed=no > -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 > -$as_echo_n "checking for SYSTEMD... " >&6; } > - > -if test -n "$SYSTEMD_CFLAGS"; then > - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists > --print-errors \"libsystemd >= 209\""; } >&5 > - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 > - ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > - test $ac_status = 0; }; then > - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" > 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > -else > - pkg_failed=yes > -fi > - else > - pkg_failed=untried > -fi > -if test -n "$SYSTEMD_LIBS"; then > - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" > - elif test -n "$PKG_CONFIG"; then > - if test -n "$PKG_CONFIG" && \ > - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists > --print-errors \"libsystemd >= 209\""; } >&5 > - ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 > - ac_status=$? > - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > - test $ac_status = 0; }; then > - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" > 2>/dev/null` > - test "x$?" != "x0" && pkg_failed=yes > -else > - pkg_failed=yes > -fi > - else > - pkg_failed=untried > -fi > - > - > - > -if test $pkg_failed = yes; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > -$as_echo "no" >&6; } > - > -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then > - _pkg_short_errors_supported=yes > -else > - _pkg_short_errors_supported=no > -fi > - if test $_pkg_short_errors_supported = yes; then > - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors -- > print-errors --cflags --libs "libsystemd >= 209" 2>&1` > - else > - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors -- > cflags --libs "libsystemd >= 209" 2>&1` > - fi > - # Put the nasty error message in config.log where it belongs > - echo "$SYSTEMD_PKG_ERRORS" >&5 > - > - systemd="n" > -elif test $pkg_failed = untried; then > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > -$as_echo "no" >&6; } > - systemd="n" > -else > - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS > - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > -$as_echo "yes" >&6; } > - systemd="y" > -fi > - > -else > - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS > - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS > - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > -$as_echo "yes" >&6; } > - systemd="y" > -fi > - > - > if test "x$enable_systemd" != "xno"; then : > > if test "x$systemd" = "xy" ; then :

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.