diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-09-08 06:50:02 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-09-08 06:50:02 +0400 |
| commit | d31c5928ddc2f5cde08e89e55fb0cbc9656fd2b9 (patch) | |
| tree | 97ce783bf4012dcdcb75532063ab09db79c77e33 /winsup/utils/Makefile.in | |
| parent | 2e5228f9648032bc8b53cdb6a278f41d963a5669 (diff) | |
* Makefile.in: Detect existence of mingw zlib headers and libraries. Build
cygcheck wihtout package checking if they are unavailable.
* dump_setup.cc: Generate dummy zlib macros when zlib is not available.
(open_package_list): Use zlib functions to uncompress package lists. Return
gzFile rather than FILE *.
(check_package_files): Change fp to gzFile to accommodate zlib functions. Use
gzgets to read from package file. Use gzclose to close the handle.
(package_list): Ditto.
(package_find): Ditto.
Diffstat (limited to 'winsup/utils/Makefile.in')
| -rw-r--r-- | winsup/utils/Makefile.in | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 43c0ee5da..9d0edb36a 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -40,6 +40,15 @@ libbfd:=${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a} libintl:=${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a} build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1} +libz:=${shell $(CC) -mno-cygwin --print-file-name=libz.a} +zlib_h:=-include ${patsubst %/lib/libz.a,%/include/libz.h,$(libz)} +zconf_h:=-include ${patsubst %/lib/libz.a,%/include/zconf.h,$(libz)} +ifeq "${dir $(libz)}" "./" +zlib_h:= +zconf_h:= +libz:= +endif + DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include libcygwin:=$(cygwin_build)/libcygwin.a @@ -90,11 +99,14 @@ else endif cygcheck.exe: cygcheck.o mingw_getopt.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) +ifeq "$(libz)" "" + echo '*** Building cygcheck without package content checking due to missing mingw libz.a.' +endif ifdef VERBOSE - $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) else - @echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\ - $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) + @echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)} $(libz);\ + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) endif dumper.o: dumper.cc dumper.h @@ -139,10 +151,10 @@ endif dump_setup.o: dump_setup.cc ifdef VERBOSE - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< + ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< else @echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ - ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< + ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< endif cygcheck.o: cygcheck.cc |