From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id F2DE53858C30; Tue, 14 Feb 2023 22:05:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2DE53858C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676412326; bh=L0oLktD3Jn9rnAyNYD9OWi2QY5Hmc0W/LWY/TLJHiqc=; h=From:To:Subject:Date:From; b=REbaWwv6yeQZwltdbLkA6ewJtXiNdJWrxg3sTEJXn49C/VXTHwGs+NdAxCfOehPKx 4waLdidf7nMUBoBMPxFl997WOlscS1rC7aNZdZQurpaPBIRThQH8QDZ9bxrdyQQ1ja Da++f4bjcUHKk2Yu5c/UdubCJEsMhZjeWwqi4H+w= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: dumper: also link with libzstd, as libbfd may require it X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: b675df6e722decfa7a4f8ed6bb8e5f90b56ac1b9 X-Git-Newrev: 2fd459c3b180def80b0db4b6c91e4f088e779cc1 Message-Id: <20230214220526.F2DE53858C30@sourceware.org> Date: Tue, 14 Feb 2023 22:05:26 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D2fd459c3b18= 0def80b0db4b6c91e4f088e779cc1 commit 2fd459c3b180def80b0db4b6c91e4f088e779cc1 Author: Jon Turney Date: Tue Feb 14 13:52:39 2023 +0000 Cygwin: dumper: also link with libzstd, as libbfd may require it =20 Also allow that linkage to be dynamic, as libzstd-devel doesn't currently provide a static library. Diff: --- .appveyor.yml | 1 + .github/workflows/cygwin.yml | 1 + winsup/configure.ac | 7 +++++++ winsup/doc/faq-programming.xml | 2 +- winsup/utils/Makefile.am | 3 ++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 50a9101b7..9f20f6d83 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,6 +35,7 @@ patch,\ cocom,\ gettext-devel,\ libiconv-devel,\ +libzstd-devel,\ zlib-devel,\ %PKGARCH%-gcc-core,\ %PKGARCH%-gcc-g++,\ diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 7ad5ccf5f..8f7b888e3 100644 --- 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 9205a8886..49a8346fa 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -116,6 +116,13 @@ AC_CHECK_LIB([bfd], [bfd_init], [true], =20 AM_CONDITIONAL(BUILD_DUMPER, [test "x$ac_cv_lib_bfd_bfd_init" =3D "xyes"]) =20 +# libbfd.a doesn't have a pkgconfig file, so we guess what it's dependenci= es +# are, based on what's present in the build environment +BFD_LIBS=3D"-lintl -liconv -liberty -lz" +AC_CHECK_LIB([sframe], [sframe_decode], [BFD_LIBS=3D"${BFD_LIBS} -lsframe"= ]) +AC_CHECK_LIB([zstd], [ZSTD_isError], [BFD_LIBS=3D"${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 632d1a173..d23f32c3a 100644 --- 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 gcc-g++, make, automake, autoconf, git, perl, -gettext-devel, libiconv-devel +gettext-devel, libiconv-devel, libzstd-devel, zlib-devel, cocom and patch= . =20 diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am index 6be5b12c2..fa6499dfe 100644 --- a/winsup/utils/Makefile.am +++ b/winsup/utils/Makefile.am @@ -78,7 +78,8 @@ LDADD =3D -lnetapi32 cygpath_CXXFLAGS =3D -fno-threadsafe-statics $(AM_CXXFLAGS) cygpath_LDADD =3D $(LDADD) -luserenv -lntdll dumper_CXXFLAGS =3D -I$(top_srcdir)/../include $(AM_CXXFLAGS) -dumper_LDADD =3D $(LDADD) -lpsapi -lbfd -lintl -liconv -liberty -lz -lntdll +dumper_LDADD =3D $(LDADD) -lpsapi -lntdll -lbfd @BFD_LIBS@ +dumper_LDFLAGS =3D ldd_LDADD =3D $(LDADD) -lpsapi -lntdll mount_CXXFLAGS =3D -DFSTAB_ONLY $(AM_CXXFLAGS) minidumper_LDADD =3D $(LDADD) -ldbghelp