From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 08A4D3858D1E; Tue, 14 Feb 2023 16:29:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08A4D3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676392176; bh=27JwODmez0qr1cKeZH8yTF9C2lAqnMNaLdqHnjdFu7o=; h=From:To:Subject:Date:From; b=IZKXl+m99TROCyHZrWSP4JXhDog4BiWKiFsb1WAKzWe9EBmU+nTvxvAYnikdLnQ/g HUGDB8Pxk67OJIMH0DzZ/p/AWEpFgBN4wXdgvzPLsEn8zX6DJfuhJ/i3fmVCBbl3Mh soQTa3eQ0rQDo/f/5hPQbPSK3BpJtWB5vZvE0fpg= 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: 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/master X-Git-Oldrev: 588624da2b0a921c7e72d12d19c2ac3321de0326 X-Git-Newrev: 1387ea9f984d5a7aa096a66b67d61dc2cc565d21 Message-Id: <20230214162936.08A4D3858D1E@sourceware.org> Date: Tue, 14 Feb 2023 16:29:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D1387ea9f984= d5a7aa096a66b67d61dc2cc565d21 commit 1387ea9f984d5a7aa096a66b67d61dc2cc565d21 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 | 10 ++++++---- winsup/doc/faq-programming.xml | 2 +- winsup/utils/Makefile.am | 7 ++----- 5 files changed, 11 insertions(+), 10 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 10d0255ef..575ff1fdc 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -81,6 +81,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 76baf0a7d..13fce0da6 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -118,10 +118,12 @@ AC_ARG_ENABLE([dumper], =20 AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" =3D "xyes"]) =20 -AC_CHECK_LIB([sframe], [sframe_decode], - AC_MSG_NOTICE([Detected libsframe; Assuming that libbfd depends on i= t]), [true]) - -AM_CONDITIONAL(HAVE_LIBSFRAME, [test "x$ac_cv_lib_sframe_sframe_decode" = =3D "xyes"]) +# 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]) =20 AC_CONFIG_FILES([ Makefile diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml index 24c7f928e..7fc6baf25 100644 --- a/winsup/doc/faq-programming.xml +++ b/winsup/doc/faq-programming.xml @@ -684,7 +684,7 @@ installed; you at least need gcc-g++, =20 Additionally, building the dumper utility requires -gettext-devel, libiconv-devel +gettext-devel, libiconv-devel, libzstd-devel and zlib-devel. Building this program can be disabled with= the --disable-dumper option to configure. diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am index f59cf9f50..57a4f377c 100644 --- a/winsup/utils/Makefile.am +++ b/winsup/utils/Makefile.am @@ -79,7 +79,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 @@ -89,10 +90,6 @@ profiler_LDADD =3D $(LDADD) -lntdll cygps_LDADD =3D $(LDADD) -lpsapi -lntdll newgrp_LDADD =3D $(LDADD) -luserenv =20 -if HAVE_LIBSFRAME -dumper_LDADD +=3D -lsframe -endif - if CROSS_BOOTSTRAP SUBDIRS =3D mingw endif