This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH] Add libz to dumper.exe link [was Re: Re: speclib vs. -lc trouble.]
- From: Dave Korn <dave dot korn dot cygwin at googlemail dot com>
- To: cygwin-patches at cygwin dot com
- Date: Mon, 13 Apr 2009 17:11:10 +0100
- Subject: [PATCH] Add libz to dumper.exe link [was Re: Re: speclib vs. -lc trouble.]
[ Why don't I resend this to the proper list, eh? ]
Dave Korn wrote:
> One slight catch: recent libbfds have grown a dependency on zlib, as they
> can natively handle compressed files. This broke the build for dumper.exe,
> which uses libbfd. The attached patch adds libz unconditionally, as it
> won't do any harm with older libbfds that don't need it, and because it's a
> bog-standard package that's easily available everywhere, so I didn't see
> the need to go to great lengths to only require it if the installed libbfd
> is sufficiently new to actually need it. Anyone building winsup from
> source would probably have zlib-devel installed already anyway.
Ok?
winsup/utils/ChangeLog
* Makefile.in (libz): New makefile variable.
(build_dumper): Test it was correctly set.
(dumper.exe): Use it.
cheers,
DaveK
? winsup/cygwin/include/stdint-h.diff
Index: winsup/utils/Makefile.in
===================================================================
RCS file: /cvs/src/src/winsup/utils/Makefile.in,v
retrieving revision 1.82
diff -p -u -r1.82 Makefile.in
--- winsup/utils/Makefile.in 18 Mar 2009 04:19:05 -0000 1.82
+++ winsup/utils/Makefile.in 13 Apr 2009 15:07:21 -0000
@@ -81,14 +81,16 @@ ldh.exe: MINGW_LDFLAGS := -nostdlib -lke
# Check for dumper's requirements and enable it if found.
LIBICONV := @libiconv@
libbfd := ${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}
+# Recent libbfd requires libz as it handles compressed files.
+libz := ${shell $(CC) -B$(bupdir2)/zlib/ --print-file-name=libz.a}
libintl := ${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a}
-build_dumper := ${shell test -r $(libbfd) -a -r $(libintl) -a -n "$(LIBICONV)" && echo 1}
+build_dumper := ${shell test -r $(libbfd) -a -r $(libz) -a -r $(libintl) -a -n "$(LIBICONV)" && echo 1}
ifdef build_dumper
CYGWIN_BINS += dumper.exe
dumper.o module_info.o parse_pe.o: CXXFLAGS += -I$(bupdir2)/bfd -I$(updir1)/include
dumper.o parse_pe.o: dumper.h
dumper.exe: module_info.o parse_pe.o
-dumper.exe: ALL_LDFLAGS += ${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty
+dumper.exe: ALL_LDFLAGS += ${libbfd} ${libintl} ${libz} -L$(bupdir1)/libiberty $(LIBICONV) -liberty
else
all: warn_dumper
endif