Re: [PATCH v3] binutils, gdb: support zstd compressed debug sections

Alan Modra via Gdb-patches
2022-09-26T05:14:46Z

On Fri, Sep 23, 2022 at 10:32:43AM -0400, Simon Marchi wrote:
> Just one question: you moved PKG_PROG_PKG_CONFIG up in ld/configure.ac,
> which I think is ok.

I'm going to fix this one another way.

> But what about the other configure.ac files, don't
> they need PKG_PROG_PKG_CONFIG too? gdb/configure.ac, for instance, uses
> pkg-config for debuginfod. So if the user passes --without-debuginfod
> --with-zstd, I expect things to fail, as the pkg-config will be skipped.

No, that will be fine, I think The reason being that
PKG_CHECK_MODULES AC_REQUIREs PKG_PROG_PKG_CONFIG. So the expansion
of AC_DEBUGINFOD will emit an expansion of PKG_PROG_PKG_CONFIG if that
has not already occurred, before the entire AC_DEBUGINFOD expansion.

> binutils/configure.ac probably has the same problem, since it uses
> PKG_CHECK_MODULES for msgpack.

I'll fix this one even though it isn't a problem now because
AC_DEBUGINFOD and AM_ZSTD preceed it. We should use AS_IF more often,
particularly when autoconf macros are invoked.

> I would suggest using PKG_PROG_PKG_CONFIG at the top of all configure.ac
> that use AM_ZSTD, out of precaution.

Better to avoid the need..

binutils/
* configure.ac (msgpack): Use "AS_IF" rather than "if".
* configure: Regenerate.
ld/
* configure.ac (jansson): Use "AS_IF" rather than "if".
* configure: Regenerate.

diff --git a/binutils/configure b/binutils/configure
index 1c518227f57..4c0c391e9d5 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -13507,8 +13507,7 @@ else
fi

-
-if test "$with_msgpack" != no; then
+if test "$with_msgpack" != no; then :

pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for msgpack" >&5
@@ -13592,29 +13591,23 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$MSGPACK_PKG_ERRORS" >&5

-
- if test "$with_msgpack" = yes; then
- as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5
- fi
-
+ if test "$with_msgpack" = yes; then :
+ as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5
+fi
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-
- if test "$with_msgpack" = yes; then
- as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5
- fi
-
+ if test "$with_msgpack" = yes; then :
+ as_fn_error $? "--with-msgpack was given, but msgpack is missing or unusable." "$LINENO" 5
+fi
else
MSGPACK_CFLAGS=$pkg_cv_MSGPACK_CFLAGS
MSGPACK_LIBS=$pkg_cv_MSGPACK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }

-
$as_echo "#define HAVE_MSGPACK 1" >>confdefs.h

-
fi
fi

diff --git a/binutils/configure.ac b/binutils/configure.ac
index ec002d3f88f..0798d84f4d1 100644
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -278,16 +278,11 @@ AC_ARG_WITH([msgpack],
[],
[with_msgpack=auto])

-
-if test "$with_msgpack" != no; then
- PKG_CHECK_MODULES(MSGPACK, msgpack, [
- AC_DEFINE([HAVE_MSGPACK], [1], [Define to 1 if msgpack is available.])
- ], [
- if test "$with_msgpack" = yes; then
- AC_MSG_ERROR([--with-msgpack was given, but msgpack is missing or unusable.])
- fi
- ])
-fi
+AS_IF([test "$with_msgpack" != no],
+ [PKG_CHECK_MODULES(MSGPACK, msgpack,
+ [AC_DEFINE([HAVE_MSGPACK], [1], [Define to 1 if msgpack is available.])],
+ [AS_IF([test "$with_msgpack" = yes],
+ [AC_MSG_ERROR([--with-msgpack was given, but msgpack is missing or unusable.])])])])

# target-specific stuff:

diff --git a/ld/configure b/ld/configure
index a1a07005400..4efe3ef5dfc 100755
--- a/ld/configure
+++ b/ld/configure
@@ -15585,7 +15585,6 @@ else
fi

-if test "x$enable_jansson" != "xno"; then

@@ -15706,8 +15705,7 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
- if test -n "$PKG_CONFIG"; then :
-
+if test "x$enable_jansson" != "xno"; then :

pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jansson" >&5
@@ -15791,15 +15789,11 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$JANSSON_PKG_ERRORS" >&5

-
- as_fn_error $? "Cannot find jansson library" "$LINENO" 5
-
+ as_fn_error $? "Cannot find jansson library" "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-
- as_fn_error $? "Cannot find jansson library" "$LINENO" 5
-
+ as_fn_error $? "Cannot find jansson library" "$LINENO" 5
else
JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
@@ -15814,11 +15808,6 @@ $as_echo "#define HAVE_JANSSON 1" >>confdefs.h

fi

-else
-
- as_fn_error $? "Cannot find pkg-config" "$LINENO" 5
-
-fi
fi

diff --git a/ld/configure.ac b/ld/configure.ac
index eb55904c090..8a8bfc9a14e 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -296,24 +296,15 @@ AC_ARG_ENABLE([jansson],
[enable_jansson=$enableval],
[enable_jansson="no"])

-if test "x$enable_jansson" != "xno"; then
- PKG_PROG_PKG_CONFIG
- AS_IF([test -n "$PKG_CONFIG"],
+AS_IF([test "x$enable_jansson" != "xno"],
+ [PKG_CHECK_MODULES(JANSSON, [jansson],
[
- PKG_CHECK_MODULES(JANSSON, [jansson],
- [
- AC_DEFINE(HAVE_JANSSON, 1, [The jansson library is to be used])
- AC_SUBST([JANSSON_CFLAGS])
- AC_SUBST([JANSSON_LIBS])
- ],
- [
- AC_MSG_ERROR([Cannot find jansson library])
- ])
+ AC_DEFINE(HAVE_JANSSON, 1, [The jansson library is to be used])
+ AC_SUBST([JANSSON_CFLAGS])
+ AC_SUBST([JANSSON_LIBS])
],
- [
- AC_MSG_ERROR([Cannot find pkg-config])
- ])
-fi
+ [AC_MSG_ERROR([Cannot find jansson library])])
+ ])

AM_BINUTILS_WARNINGS

--
Alan Modra
Australia Development Lab, IBM