drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jon Turney 2023-02-14 13:52:39 +00:00
parent 588624da2b
commit 1387ea9f98
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@ -35,6 +35,7 @@ patch,\
cocom,\ cocom,\
gettext-devel,\ gettext-devel,\
libiconv-devel,\ libiconv-devel,\
libzstd-devel,\
zlib-devel,\ zlib-devel,\
%PKGARCH%-gcc-core,\ %PKGARCH%-gcc-core,\
%PKGARCH%-gcc-g++,\ %PKGARCH%-gcc-g++,\

1
.github/workflows/cygwin.yml vendored
View File

@ -81,6 +81,7 @@ jobs:
gettext-devel, gettext-devel,
libiconv, libiconv,
libiconv-devel, libiconv-devel,
libzstd-devel,
make, make,
mingw64-${{ matrix.pkgarch }}-gcc-g++, mingw64-${{ matrix.pkgarch }}-gcc-g++,
mingw64-${{ matrix.pkgarch }}-zlib, mingw64-${{ matrix.pkgarch }}-zlib,

10
winsup/configure.ac
View File

@ -118,10 +118,12 @@ AC_ARG_ENABLE([dumper],
AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" = "xyes"]) AM_CONDITIONAL(BUILD_DUMPER, [test "x$build_dumper" = "xyes"])
AC_CHECK_LIB([sframe], [sframe_decode], # libbfd.a doesn't have a pkgconfig file, so we guess what it's dependencies
AC_MSG_NOTICE([Detected libsframe; Assuming that libbfd depends on it]), [true]) # are, based on what's present in the build environment
BFD_LIBS="-lintl -liconv -liberty -lz"
AM_CONDITIONAL(HAVE_LIBSFRAME, [test "x$ac_cv_lib_sframe_sframe_decode" = "xyes"]) 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([ AC_CONFIG_FILES([
Makefile Makefile

2
winsup/doc/faq-programming.xml
View File

@ -684,7 +684,7 @@ installed; you at least need <literal>gcc-g++</literal>,
<para> <para>
Additionally, building the <code>dumper</code> utility requires Additionally, building the <code>dumper</code> utility requires
<literal>gettext-devel</literal>, <literal>libiconv-devel</literal> <literal>gettext-devel</literal>, <literal>libiconv-devel</literal>, <literal>libzstd-devel</literal> and
<literal>zlib-devel</literal>. Building this program can be disabled with the <literal>zlib-devel</literal>. Building this program can be disabled with the
<literal>--disable-dumper</literal> option to <literal>configure</literal>. <literal>--disable-dumper</literal> option to <literal>configure</literal>.
</para> </para>

7
winsup/utils/Makefile.am
View File

@ -79,7 +79,8 @@ LDADD = -lnetapi32
cygpath_CXXFLAGS = -fno-threadsafe-statics $(AM_CXXFLAGS) cygpath_CXXFLAGS = -fno-threadsafe-statics $(AM_CXXFLAGS)
cygpath_LDADD = $(LDADD) -luserenv -lntdll cygpath_LDADD = $(LDADD) -luserenv -lntdll
dumper_CXXFLAGS = -I$(top_srcdir)/../include $(AM_CXXFLAGS) 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 ldd_LDADD = $(LDADD) -lpsapi -lntdll
mount_CXXFLAGS = -DFSTAB_ONLY $(AM_CXXFLAGS) mount_CXXFLAGS = -DFSTAB_ONLY $(AM_CXXFLAGS)
minidumper_LDADD = $(LDADD) -ldbghelp minidumper_LDADD = $(LDADD) -ldbghelp
@ -89,10 +90,6 @@ profiler_LDADD = $(LDADD) -lntdll
cygps_LDADD = $(LDADD) -lpsapi -lntdll cygps_LDADD = $(LDADD) -lpsapi -lntdll
newgrp_LDADD = $(LDADD) -luserenv newgrp_LDADD = $(LDADD) -luserenv
if HAVE_LIBSFRAME
dumper_LDADD += -lsframe
endif
if CROSS_BOOTSTRAP if CROSS_BOOTSTRAP
SUBDIRS = mingw SUBDIRS = mingw
endif endif