A mirror of https://github.com/madler/zlib.git https://git.lua4.win/zlib/atom?h=v1.2.6.1 2012-02-04T18:14:13+00:00 2012-02-04T18:14:13+00:00 Mark Adler madler@alumni.caltech.edu 2012-02-04T18:14:13+00:00 urn:sha1:fc68b60086a69af7d3dab403b4dc98d01486780e 2012-02-02T07:25:34+00:00 Mark Adler madler@alumni.caltech.edu 2012-02-02T07:25:34+00:00 urn:sha1:55b8b5fec16503cb9ce26074f600a1d7b426a0cc gzflags() was put in gzwrite.c in order to be compiled exactly the same as gzprintf(), so that it was guaranteed to return the correct information. However that causes a static linkage to zlib to bring in many routines that are often not used. All that is required to duplicate the compilation environment of gzprintf() is to include gzguts.h. So that is now done in zutil.c to assure that the correct flags are returned. 2012-01-30T05:15:24+00:00 Mark Adler madler@alumni.caltech.edu 2012-01-30T03:25:44+00:00 urn:sha1:7b3f71ba5fc29f3743fae9b9dbe071018a6b6b4e 2012-01-22T01:15:48+00:00 Jonathan Nieder jrnieder@gmail.com 2012-01-21T21:55:54+00:00 urn:sha1:32d8a5379eb91c7fd55304b567a07ad0e2524398 This makes build-testing and installing the minizip/miniunzip programs as simple as "autoreconf -if && ./configure --enable-demos && make && make install". Without --enable-demos, the makefile will only build and install the library, as before. Helped by Mike Frysinger. minizip/miniunzip were not intended to be general-purpose installed utilities, but they can be useful from time to time as a lightweight substitute for zip/unzip. You can also use them to quickly test that the library installation procedure worked. 2012-01-21T20:56:57+00:00 Jonathan Nieder jrnieder@gmail.com 2012-01-17T21:06:41+00:00 urn:sha1:f0cff24214d437ef28d0eb92f9bc45a36cf25530 Instead of using relative paths directly, use paths relative to top_srcdir and top_builddir to refer to source files and built files, respectively. Note that the toplevel zlib configure script still does not have any special support for out-of-tree builds. But now you can do (cd contrib/minizip && autoreconf -fis) mkdir -p BUILD/test cp *.c *.h *.in zlib.map configure zlib.3 BUILD cp test/*.c BUILD/test (cd BUILD && ./configure --shared) (cd BUILD && make) mkdir -p BUILD/contrib/minizip cd BUILD/contrib/minizip ../../../contrib/minizip/configure make While at it, move the include path and library path settings to CPPFLAGS and LDFLAGS respectively instead of setting both in CFLAGS. Thanks to Mike Frysinger for advice. 2012-01-21T20:46:25+00:00 Jonathan Nieder jrnieder@gmail.com 2012-01-17T20:28:30+00:00 urn:sha1:81015585d27875e250bdb8f375f2dd999e31a73f Trying to build the minizip utility from contrib/minizip after an autoreconf -f: libtool: link: gcc -g -O2 -o minizip minizip.o minizip.o: In function `getFileCrc': /tmp/zlib/contrib/minizip/minizip.c:211: undefined reference to `crc32' minizip.o: In function `main': /tmp/zlib/contrib/minizip/minizip.c:378: undefined reference to `zipOpen64' /tmp/zlib/contrib/minizip/minizip.c:451: undefined reference to `zipOpenNewFileInZip3_64' /tmp/zlib/contrib/minizip/minizip.c:502: undefined reference to `zipCloseFileInZip' /tmp/zlib/contrib/minizip/minizip.c:509: undefined reference to `zipClose' /tmp/zlib/contrib/minizip/minizip.c:485: undefined reference to `zipWriteInFileInZip' collect2: error: ld returned 1 exit status The cause: contrib/minizip/Makefile.am does not specify that minizip needs to be linked to libminizip. With some linkers (e.g., GNU binutils without --copy-dt-needed-entries), an indirect dependency cannot be used to resolve symbols, so link to libz for crc32(), too. 2012-01-21T20:45:38+00:00 Jonathan Nieder jrnieder@gmail.com 2012-01-17T20:26:05+00:00 urn:sha1:ad88c19baae5203a7405ec88ac5becc1b4a641a4 Trying to build miniunzip utility from contrib/minizip after an autoreconf -f produces [...] In file included from minizip.c:61:0: zip.h:50:18: fatal error: zlib.h: No such file or directory unless zlib is already installed. Use AM_CFLAGS to set the include path and library path to point to the just-build copy of zlib to fix this. (This was already done for libminizip but not the binaries that use it before this patch.) 2012-01-21T20:00:26+00:00 Mark Adler madler@alumni.caltech.edu 2012-01-21T19:59:32+00:00 urn:sha1:17741efa029dcfac56be14b70172d708ca612ad4 2012-01-21T19:58:45+00:00 Mark Adler madler@alumni.caltech.edu 2012-01-21T19:54:52+00:00 urn:sha1:de6cb6fe5c0b209c0337a78294017c38efd54c6b 2012-01-21T19:58:45+00:00 Mark Adler madler@alumni.caltech.edu 2012-01-21T19:51:54+00:00 urn:sha1:601b542a9d6c3689fce1414ec089d5f193656faa