1. Patchew
  2. Xen
  3. View series

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

Andrew Cooper posted 1 patch 5 months, 4 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20240530101439.16730-1-andrew.cooper3@citrix.com
m4/systemd.m4   |   8 --
tools/configure | 229 +-----------------------------------------------
2 files changed, 1 insertion(+), 236 deletions(-)
[PATCH] tools: (Actually) drop libsystemd as a dependency
Posted by Andrew Cooper 5 months, 4 weeks ago 
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@citrix.com>
---
CC: Anthony PERARD <anthony@xenproject.org>
CC: Juergen Gross <jgross@suse.com>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: George Dunlap <George.Dunlap@citrix.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>

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 :
-- 
2.34.1
Re: [PATCH] tools: (Actually) drop libsystemd as a dependency
Posted by Oleksii K. 5 months, 3 weeks ago 
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@citrix.com>
Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>

~ Oleksii
> ---
> CC: Anthony PERARD <anthony@xenproject.org>
> CC: Juergen Gross <jgross@suse.com>
> CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> CC: George Dunlap <George.Dunlap@citrix.com>
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Julien Grall <julien@xen.org>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> 
> 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 :
Re: [PATCH] tools: (Actually) drop libsystemd as a dependency
Posted by Roger Pau Monné 5 months, 4 weeks ago 
On Thu, May 30, 2024 at 11:14:39AM +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@citrix.com>

LGTM, but my knowledge of systemd is very limited.

Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

Thanks, Roger.
Re: [PATCH] tools: (Actually) drop libsystemd as a dependency
Posted by Andrew Cooper 5 months, 4 weeks ago 
On 30/05/2024 12:02 pm, Roger Pau Monné wrote:
> On Thu, May 30, 2024 at 11:14:39AM +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@citrix.com>
> LGTM, but my knowledge of systemd is very limited.
>
> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

Thanks.  TBH, this is all M4/autoconf, rather than systemd.

~Andrew
Re: [PATCH] tools: (Actually) drop libsystemd as a dependency
Posted by Roger Pau Monné 5 months, 4 weeks ago 
On Thu, May 30, 2024 at 12:12:19PM +0100, Andrew Cooper wrote:
> On 30/05/2024 12:02 pm, Roger Pau Monné wrote:
> > On Thu, May 30, 2024 at 11:14:39AM +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@citrix.com>
> > LGTM, but my knowledge of systemd is very limited.
> >
> > Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
> 
> Thanks.  TBH, this is all M4/autoconf, rather than systemd.

Right, but it's about systemd dependencies which is what I don't know
about.  The m4 stuff LGTM, whether it's appropriate to drop the
dependency is what I can't be sure about.

Thanks, Roger.

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.