Cygwin: dumper: also link with libzstd, as libbfd may require it

Also allow that linkage to be dynamic, as libzstd-devel doesn't
currently provide a static library.

diff --git a/.appveyor.yml b/.appveyor.yml
index 50a9101b7e49ecdb24e909823d720577d329a8a8..9f20f6d8354722160ac90b41ba48103f0716fa90 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -35,6 +35,7 @@ patch,\
 cocom,\\r
 gettext-devel,\\r
 libiconv-devel,\\r
+libzstd-devel,\\r
 zlib-devel,\\r
 %PKGARCH%-gcc-core,\\r
 %PKGARCH%-gcc-g++,\\r

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 7ad5ccf5f0ff5ebd306328c97ca8e2bea2cc9ebc..8f7b888e3c57cf9db80b14047bef4c994cf2df2d 100644 (file)
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -80,6 +80,7 @@ jobs:
           gettext-devel,
           libiconv,
           libiconv-devel,
+          libzstd-devel,
           make,
           mingw64-${{ matrix.pkgarch }}-gcc-g++,
           mingw64-${{ matrix.pkgarch }}-zlib,

diff --git a/winsup/configure.ac b/winsup/configure.ac
index 9205a8886ebed698eeef92abbce610408f571b5d..49a8346fa81e98b1dd504d5fe7e55215b4b89b54 100644 (file)
--- a/winsup/configure.ac
+++ b/winsup/configure.ac
@@ -116,6 +116,13 @@ AC_CHECK_LIB([bfd], [bfd_init], [true],
 
 AM_CONDITIONAL(BUILD_DUMPER, [test "x$ac_cv_lib_bfd_bfd_init" = "xyes"])
 
+# libbfd.a doesn't have a pkgconfig file, so we guess what it's dependencies
+# are, based on what's present in the build environment
+BFD_LIBS="-lintl -liconv -liberty -lz"
+AC_CHECK_LIB([sframe], [sframe_decode], [BFD_LIBS="${BFD_LIBS} -lsframe"])
+AC_CHECK_LIB([zstd], [ZSTD_isError], [BFD_LIBS="${BFD_LIBS} -lzstd"])
+AC_SUBST([BFD_LIBS])
+
 AC_CONFIG_FILES([
     Makefile
     cygwin/Makefile

diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index 632d1a173d663778547562f30dea220e6d401140..d23f32c3a728e63e552c134e1795cd3f79847006 100644 (file)
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -679,7 +679,7 @@ rewriting the runtime library in question from specs...
 installed; you at least need <literal>gcc-g++</literal>,
 <literal>make</literal>, <literal>automake</literal>,
 <literal>autoconf</literal>, <literal>git</literal>, <literal>perl</literal>,
-<literal>gettext-devel</literal>, <literal>libiconv-devel</literal>
+<literal>gettext-devel</literal>, <literal>libiconv-devel</literal>, <literal>libzstd-devel</literal>,
 <literal>zlib-devel</literal>, <literal>cocom</literal> and <literal>patch</literal>.
 </para>
 

diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am
index 6be5b12c239ac40088706e165034207c9d9f559f..fa6499dfeed6da5636708f97a0e4627e674259fb 100644 (file)
--- a/winsup/utils/Makefile.am
+++ b/winsup/utils/Makefile.am
@@ -78,7 +78,8 @@ LDADD = -lnetapi32
 cygpath_CXXFLAGS = -fno-threadsafe-statics $(AM_CXXFLAGS)
 cygpath_LDADD = $(LDADD) -luserenv -lntdll
 dumper_CXXFLAGS = -I$(top_srcdir)/../include $(AM_CXXFLAGS)
-dumper_LDADD = $(LDADD) -lpsapi -lbfd -lintl -liconv -liberty -lz -lntdll
+dumper_LDADD = $(LDADD) -lpsapi -lntdll -lbfd @BFD_LIBS@
+dumper_LDFLAGS =
 ldd_LDADD = $(LDADD) -lpsapi -lntdll
 mount_CXXFLAGS = -DFSTAB_ONLY $(AM_CXXFLAGS)
 minidumper_LDADD = $(LDADD) -ldbghelp