Skip to content

Commit a7d7066

Browse files
madlermadler
committedSep 10, 2011
zlib 1.2.4.4
·
v1.2.8v1.2.4.4
1 parent f4498be commit a7d7066

22 files changed

+138
-81
lines changed
 

‎ChangeLog

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11

22
ChangeLog file for zlib
33

4+
Changes in 1.2.4.4 (18 Apr 2010)
5+
- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [T�r�k]
6+
- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
7+
- Try to use bash or ksh regardless of functionality of /bin/sh
8+
- Fix configure incompatibility with NetBSD sh
9+
- Remove attempt to run under bash or ksh since have better NetBSD fix
10+
- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
11+
- Add diagnostic messages when using CROSS_PREFIX in configure
12+
- Added --sharedlibdir option to configure [Weigelt]
13+
- Use hidden visibility attribute when available [Frysinger]
14+
415
Changes in 1.2.4.3 (10 Apr 2010)
516
- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
617
- Use CROSS_PREFIX for nm [Bar-Lev]

‎Makefile.in

+6-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CPP=$(CC) -E
3232

3333
STATICLIB=libz.a
3434
SHAREDLIB=libz.so
35-
SHAREDLIBV=libz.so.1.2.4.3
35+
SHAREDLIBV=libz.so.1.2.4.4
3636
SHAREDLIBM=libz.so.1
3737
LIBS=$(STATICLIB) $(SHAREDLIBV)
3838

@@ -47,6 +47,7 @@ EXE=
4747
prefix = /usr/local
4848
exec_prefix = ${prefix}
4949
libdir = ${exec_prefix}/lib
50+
sharedlibdir = ${libdir}
5051
includedir = ${prefix}/include
5152
mandir = ${prefix}/share/man
5253
man3dir = ${mandir}/man3
@@ -163,12 +164,14 @@ minigzip64$(EXE): minigzip64.o $(STATICLIB)
163164
install-libs: $(LIBS)
164165
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
165166
-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
167+
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
166168
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
167169
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
168-
cp $(LIBS) $(DESTDIR)$(libdir)
170+
cp $(STATICLIB) $(DESTDIR)$(libdir)
171+
cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
169172
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
170173
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
171-
-@cd $(DESTDIR)$(libdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
174+
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
172175
chmod 755 $(SHAREDLIBV); \
173176
rm -f $(SHAREDLIB) $(SHAREDLIBM); \
174177
ln -s $(SHAREDLIBV) $(SHAREDLIB); \

‎README

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB DATA COMPRESSION LIBRARY
22

3-
zlib 1.2.4.3 is a general purpose data compression library. All the code is
3+
zlib 1.2.4.4 is a general purpose data compression library. All the code is
44
thread safe. The data format used by the zlib library is described by RFCs
55
(Request for Comments) 1950 to 1952 in the files
66
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
3131
issue of Dr. Dobb's Journal; a copy of the article is available at
3232
http://marknelson.us/1997/01/01/zlib-engine/ .
3333

34-
The changes made in version 1.2.4.3 are documented in the file ChangeLog.
34+
The changes made in version 1.2.4.4 are documented in the file ChangeLog.
3535

3636
Unsupported third party contributions are provided in directory contrib/ .
3737

‎configure

+35-39
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,8 @@
1313
# If you have problems, try without defining CC and CFLAGS before reporting
1414
# an error.
1515

16-
# make sure we are running under a compatible shell (stolen from ffmpeg and libnfo,
17-
# except their's wasn't portable enough due to ! usage, so this is better)
18-
if test "0$ZLIB_CONFIGURE_EXEC" -lt 1; then
19-
unset foo
20-
try=0
21-
(: ${foo%%bar}) 2>/dev/null
22-
if test "$?" -ne 0; then
23-
try=1
24-
else
25-
(: ${foo?}) 2>/dev/null
26-
if test "$?" -eq 0; then
27-
try=1
28-
fi
29-
fi
30-
if test "$try" -eq 1; then
31-
ZLIB_CONFIGURE_EXEC=1
32-
export ZLIB_CONFIGURE_EXEC
33-
type "bash" > /dev/null 2>&1 && exec bash "$0" "$@"
34-
type "ksh" > /dev/null 2>&1 && exec ksh "$0" "$@"
35-
if test -x /usr/xpg4/bin/sh; then
36-
exec /usr/xpg4/bin/sh "$0" "$@"
37-
fi
38-
# echo "No compatible shell script interpreter found."
39-
# exit 1
40-
# we could give up here, but go ahead and give their old sh a try
41-
fi
42-
unset try
43-
fi
44-
4516
if [ -n "${CHOST}" ]; then
46-
uname="$(echo "${CHOST}" | sed 's/.*-.*-\(.*\)-.*/\1/')"
17+
uname="$(echo "${CHOST}" | sed -e 's/.*-.*-\(.*\)-.*$/\1/' -e 's/.*-\(.*\)-.*/\1/' -e 's/.*-\(.*\)$/\1/')"
4718
CROSS_PREFIX="${CHOST}-"
4819
fi
4920

@@ -53,24 +24,28 @@ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
5324
VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
5425
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
5526
VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
56-
if [ -x "${CROSS_PREFIX}ar" ]; then
27+
if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
5728
AR=${AR-"${CROSS_PREFIX}ar"}
29+
test -n "${CROSS_PREFIX}" && echo Using ${AR}
5830
else
5931
AR=${AR-"ar"}
32+
test -n "${CROSS_PREFIX}" && echo Using ${AR}
6033
fi
6134
AR_RC="${AR} rc"
62-
if [ -x "${CROSS_PREFIX}ranlib" ]; then
35+
if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
6336
RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
37+
test -n "${CROSS_PREFIX}" && echo Using ${RANLIB}
6438
else
6539
RANLIB=${RANLIB-"ranlib"}
6640
fi
67-
if [ -x "${CROSS_PREFIX}nm" ]; then
41+
if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
6842
NM=${NM-"${CROSS_PREFIX}nm"}
43+
test -n "${CROSS_PREFIX}" && echo Using ${NM}
6944
else
7045
NM=${NM-"nm"}
7146
fi
7247
LDCONFIG=${LDCONFIG-"ldconfig"}
73-
LDSHAREDLIBC="${LDSHAREDLIBC-"-lc"}"
48+
LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
7449
prefix=${prefix-/usr/local}
7550
exec_prefix=${exec_prefix-'${prefix}'}
7651
libdir=${libdir-'${exec_prefix}/lib'}
@@ -90,11 +65,13 @@ case "$1" in
9065
-h* | --help)
9166
echo 'usage:'
9267
echo ' configure [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]'
93-
echo ' [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
68+
echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]'
69+
echo ' [--includedir=INCLUDEDIR]'
9470
exit 0 ;;
9571
-p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
9672
-e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
9773
-l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
74+
--sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
9875
-i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
9976
-u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
10077
-p* | --prefix) prefix="$2"; shift; shift ;;
@@ -117,7 +94,7 @@ extern int getchar();
11794
int hello() {return getchar();}
11895
EOF
11996

120-
test -z "$CC" && echo Checking for gcc...
97+
test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc...
12198
cc=${CC-${CROSS_PREFIX}gcc}
12299
cflags=${CFLAGS-"-O3"}
123100
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
@@ -127,8 +104,8 @@ esac
127104

128105
if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
129106
CC="$cc"
130-
SFLAGS="${CFLAGS-"-O3"} -fPIC"
131-
CFLAGS="${CFLAGS-"-O3"}"
107+
SFLAGS="${CFLAGS--O3} -fPIC"
108+
CFLAGS="${CFLAGS--O3}"
132109
if test $build64 -eq 1; then
133110
CFLAGS="${CFLAGS} -m64"
134111
SFLAGS="${SFLAGS} -m64"
@@ -143,7 +120,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
143120
Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
144121
CYGWIN* | Cygwin* | cygwin* | OS/2*)
145122
EXE='.exe' ;;
146-
MINGW*)
123+
MINGW*|mingw*)
147124
LDSHARED=${LDSHARED-"$cc -shared"}
148125
LDSHAREDLIBC=""
149126
EXE='.exe' ;;
@@ -527,6 +504,23 @@ EOF
527504
fi
528505
fi
529506

507+
cat > $test.c <<EOF
508+
int foo __attribute__ ((visibility ("hidden")));
509+
int main()
510+
{
511+
return 0;
512+
}
513+
EOF
514+
if test "`($CC -c -fvisibility=hidden $CFLAGS $test.c) 2>&1`" = ""; then
515+
CFLAGS="$CFLAGS -fvisibility=hidden"
516+
SFLAGS="$SFLAGS -fvisibility=hidden"
517+
echo "Checking for attribute(visibility) support... Yes."
518+
else
519+
CFLAGS="$CFLAGS -DNO_VIZ"
520+
SFLAGS="$SFLAGS -DNO_VIZ"
521+
echo "Checking for attribute(visibility) support... No."
522+
fi
523+
530524
CPP=${CPP-"$CC -E"}
531525
case $CFLAGS in
532526
*ASMV*)
@@ -560,6 +554,7 @@ sed < Makefile.in "
560554
/^prefix *=/s#=.*#=$prefix#
561555
/^exec_prefix *=/s#=.*#=$exec_prefix#
562556
/^libdir *=/s#=.*#=$libdir#
557+
/^sharedlibdir *=/s#=.*#=$sharedlibdir#
563558
/^includedir *=/s#=.*#=$includedir#
564559
/^mandir *=/s#=.*#=$mandir#
565560
/^all: */s#:.*#: $ALL#
@@ -581,6 +576,7 @@ sed < zlib.pc.in "
581576
/^prefix *=/s#=.*#=$prefix#
582577
/^exec_prefix *=/s#=.*#=$exec_prefix#
583578
/^libdir *=/s#=.*#=$libdir#
579+
/^sharedlibdir *=/s#=.*#=$sharedlibdir#
584580
/^includedir *=/s#=.*#=$includedir#
585581
/^mandir *=/s#=.*#=$mandir#
586582
/^LDFLAGS *=/s#=.*#=$LDFLAGS#

‎contrib/delphi/ZLib.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152152
const OutBuf: Pointer; BufSize: Integer);
153153

154154
const
155-
zlib_version = '1.2.4.3';
155+
zlib_version = '1.2.4.4';
156156

157157
type
158158
EZlibError = class(Exception);

‎contrib/dotzlib/DotZLib/UnitTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public class InfoTests
156156
public void Info_Version()
157157
{
158158
Info info = new Info();
159-
Assert.AreEqual("1.2.4.3", Info.Version);
159+
Assert.AreEqual("1.2.4.4", Info.Version);
160160
Assert.AreEqual(32, info.SizeOfUInt);
161161
Assert.AreEqual(32, info.SizeOfULong);
162162
Assert.AreEqual(32, info.SizeOfPointer);

‎contrib/infback9/inftree9.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define MAXBITS 15
1010

1111
const char inflate9_copyright[] =
12-
" inflate9 1.2.4.3 Copyright 1995-2010 Mark Adler ";
12+
" inflate9 1.2.4.4 Copyright 1995-2010 Mark Adler ";
1313
/*
1414
If you use the zlib library in a product, an acknowledgment is welcome
1515
in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
6464
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
6565
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
6666
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67-
133, 133, 133, 133, 144, 195, 66};
67+
133, 133, 133, 133, 144, 74, 65};
6868
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
6969
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
7070
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,

‎contrib/pascal/zlibpas.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
interface
1111

1212
const
13-
ZLIB_VERSION = '1.2.4.3';
13+
ZLIB_VERSION = '1.2.4.4';
1414

1515
type
1616
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;

‎contrib/vstudio/vc10/zlib.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1,2,4,3
6-
PRODUCTVERSION 1,2,4,3
5+
FILEVERSION 1,2,4,4
6+
PRODUCTVERSION 1,2,4,4
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.4.3\0"
20+
VALUE "FileVersion", "1.2.4.4\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlib.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎contrib/vstudio/vc9/zlib.rc

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#define IDR_VERSION1 1
44
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5-
FILEVERSION 1,2,4,3
6-
PRODUCTVERSION 1,2,4,3
5+
FILEVERSION 1,2,4,4
6+
PRODUCTVERSION 1,2,4,4
77
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
88
FILEFLAGS 0
99
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
1717

1818
BEGIN
1919
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20-
VALUE "FileVersion", "1.2.4.3\0"
20+
VALUE "FileVersion", "1.2.4.4\0"
2121
VALUE "InternalName", "zlib\0"
2222
VALUE "OriginalFilename", "zlib.dll\0"
2323
VALUE "ProductName", "ZLib.DLL\0"

‎deflate.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#include "deflate.h"
5353

5454
const char deflate_copyright[] =
55-
" deflate 1.2.4.3 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
55+
" deflate 1.2.4.4 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
5656
/*
5757
If you use the zlib library in a product, an acknowledgment is welcome
5858
in the documentation of your product. If for some reason you cannot

‎inftrees.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define MAXBITS 15
1010

1111
const char inflate_copyright[] =
12-
" inflate 1.2.4.3 Copyright 1995-2010 Mark Adler ";
12+
" inflate 1.2.4.4 Copyright 1995-2010 Mark Adler ";
1313
/*
1414
If you use the zlib library in a product, an acknowledgment is welcome
1515
in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
6262
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
6363
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
6464
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
65-
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 195, 66};
65+
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 74, 65};
6666
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
6767
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
6868
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

‎qnx/package.qpg

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<QPG:Files>
2626
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
2727
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28-
<QPG:Add file="../libz.so.1.2.4.3" install="/opt/lib/" user="root:bin" permission="644"/>
29-
<QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.4.3"/>
30-
<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.4.3"/>
31-
<QPG:Add file="../libz.so.1.2.4.3" install="/opt/lib/" component="slib"/>
28+
<QPG:Add file="../libz.so.1.2.4.4" install="/opt/lib/" user="root:bin" permission="644"/>
29+
<QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.4.4"/>
30+
<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.4.4"/>
31+
<QPG:Add file="../libz.so.1.2.4.4" install="/opt/lib/" component="slib"/>
3232
</QPG:Files>
3333

3434
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
6363
</QPM:ProductDescription>
6464

6565
<QPM:ReleaseDescription>
66-
<QPM:ReleaseVersion>1.2.4.3</QPM:ReleaseVersion>
66+
<QPM:ReleaseVersion>1.2.4.4</QPM:ReleaseVersion>
6767
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
6868
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
6969
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>

‎treebuild.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
2-
<package name="zlib" version="1.2.4.3">
3-
<library name="zlib" dlversion="1.2.4.3" dlname="z">
2+
<package name="zlib" version="1.2.4.4">
3+
<library name="zlib" dlversion="1.2.4.4" dlname="z">
44
<property name="description"> zip compression library </property>
55
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
66

‎win32/Makefile.gcc

+22-6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ STATICLIB = libz.a
2727
SHAREDLIB = zlib1.dll
2828
IMPLIB = libzdll.a
2929

30+
#
31+
# Set to 1 if shared object needs to be installed
32+
#
33+
SHARED_MODE=0
34+
3035
#LOC = -DASMV
3136
#LOC = -DDEBUG -g
3237

@@ -38,7 +43,7 @@ AS = $(CC)
3843
ASFLAGS = $(LOC) -Wall
3944

4045
LD = $(CC)
41-
LDFLAGS = $(LOC) -s
46+
LDFLAGS = $(LOC)
4247

4348
AR = $(PREFIX)ar
4449
ARFLAGS = rcs
@@ -82,43 +87,54 @@ $(STATICLIB): $(OBJS) $(OBJA)
8287
$(IMPLIB): $(SHAREDLIB)
8388

8489
$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
85-
$(CC) -shared -Wl,--out-implib,$(IMPLIB) \
90+
$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
8691
-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
8792
$(STRIP) $@
8893

8994
example.exe: example.o $(STATICLIB)
9095
$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
96+
$(STRIP) $@
9197

9298
minigzip.exe: minigzip.o $(STATICLIB)
9399
$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
100+
$(STRIP) $@
94101

95102
example_d.exe: example.o $(IMPLIB)
96103
$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
104+
$(STRIP) $@
97105

98106
minigzip_d.exe: minigzip.o $(IMPLIB)
99107
$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
108+
$(STRIP) $@
100109

101110
zlibrc.o: win32/zlib1.rc
102111
$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
103112

104113

105-
# INCLUDE_PATH and LIBRARY_PATH must be set.
114+
# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
106115

107116
.PHONY: install uninstall clean
108117

109-
install: zlib.h zconf.h $(LIB)
118+
install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
119+
-if [ "$(SHARED_MODE)" = "1" ]; then \
120+
mkdir -p $(BINARY_PATH); \
121+
$(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \
122+
$(INSTALL) $(IMPLIB) $(LIBRARY_PATH); \
123+
fi
110124
-@mkdir -p $(INCLUDE_PATH)
111125
-@mkdir -p $(LIBRARY_PATH)
112126
-$(INSTALL) zlib.h $(INCLUDE_PATH)
113127
-$(INSTALL) zconf.h $(INCLUDE_PATH)
114128
-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
115-
-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
116129

117130
uninstall:
131+
-if [ "$(SHARED_MODE)" = "1" ]; then \
132+
$(RM) $(BINARY_PATH)/$(SHAREDLIB); \
133+
$(RM) $(LIBRARY_PATH)/$(IMPLIB); \
134+
fi
118135
-$(RM) $(INCLUDE_PATH)/zlib.h
119136
-$(RM) $(INCLUDE_PATH)/zconf.h
120137
-$(RM) $(LIBRARY_PATH)/$(STATICLIB)
121-
-$(RM) $(LIBRARY_PATH)/$(IMPLIB)
122138

123139
clean:
124140
-$(RM) $(STATICLIB)

‎zconf.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
# endif
316316
#endif
317317

318-
#ifdef HAVE_VISIBILITY_PRAGMA
318+
#ifndef NO_VIZ
319319
# define ZEXTERN __attribute__((visibility ("default"))) extern
320320
#endif
321321

@@ -368,6 +368,16 @@ typedef uLong FAR uLongf;
368368
# include <sys/types.h> /* for off_t */
369369
#endif
370370

371+
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
372+
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
373+
* though the former does not conform to the LFS document), but considering
374+
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
375+
* equivalently requesting no 64-bit operations
376+
*/
377+
#if -_LARGEFILE64_SOURCE - -1 == 1
378+
# undef _LARGEFILE64_SOURCE
379+
#endif
380+
371381
#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
372382
# include <unistd.h> /* for SEEK_* and off_t */
373383
# ifdef VMS

‎zconf.h.cmakein

+11-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
# endif
318318
#endif
319319

320-
#ifdef HAVE_VISIBILITY_PRAGMA
320+
#ifndef NO_VIZ
321321
# define ZEXTERN __attribute__((visibility ("default"))) extern
322322
#endif
323323

@@ -370,6 +370,16 @@ typedef uLong FAR uLongf;
370370
# include <sys/types.h> /* for off_t */
371371
#endif
372372

373+
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
374+
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
375+
* though the former does not conform to the LFS document), but considering
376+
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
377+
* equivalently requesting no 64-bit operations
378+
*/
379+
#if -_LARGEFILE64_SOURCE - -1 == 1
380+
# undef _LARGEFILE64_SOURCE
381+
#endif
382+
373383
#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
374384
# include <unistd.h> /* for SEEK_* and off_t */
375385
# ifdef VMS

‎zconf.h.in

+11-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
# endif
316316
#endif
317317

318-
#ifdef HAVE_VISIBILITY_PRAGMA
318+
#ifndef NO_VIZ
319319
# define ZEXTERN __attribute__((visibility ("default"))) extern
320320
#endif
321321

@@ -368,6 +368,16 @@ typedef uLong FAR uLongf;
368368
# include <sys/types.h> /* for off_t */
369369
#endif
370370

371+
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
372+
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
373+
* though the former does not conform to the LFS document), but considering
374+
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
375+
* equivalently requesting no 64-bit operations
376+
*/
377+
#if -_LARGEFILE64_SOURCE - -1 == 1
378+
# undef _LARGEFILE64_SOURCE
379+
#endif
380+
371381
#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
372382
# include <unistd.h> /* for SEEK_* and off_t */
373383
# ifdef VMS

‎zlib.3

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH ZLIB 3 "10 Apr 2010"
1+
.TH ZLIB 3 "18 Apr 2010"
22
.SH NAME
33
zlib \- compression/decompression library
44
.SH SYNOPSIS
@@ -125,7 +125,7 @@ before asking for help.
125125
Send questions and/or comments to zlib@gzip.org,
126126
or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
127127
.SH AUTHORS
128-
Version 1.2.4.3
128+
Version 1.2.4.4
129129
Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org)
130130
and Mark Adler (madler@alumni.caltech.edu).
131131
.LP

‎zlib.3.pdf

-1 Bytes
Binary file not shown.

‎zlib.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* zlib.h -- interface of the 'zlib' general purpose compression library
2-
version 1.2.4.3, April 10th, 2010
2+
version 1.2.4.4, April 18th, 2010
33
44
Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
55
@@ -37,12 +37,12 @@
3737
extern "C" {
3838
#endif
3939

40-
#define ZLIB_VERSION "1.2.4.3"
41-
#define ZLIB_VERNUM 0x1243
40+
#define ZLIB_VERSION "1.2.4.4"
41+
#define ZLIB_VERNUM 0x1244
4242
#define ZLIB_VER_MAJOR 1
4343
#define ZLIB_VER_MINOR 2
4444
#define ZLIB_VER_REVISION 4
45-
#define ZLIB_VER_SUBREVISION 3
45+
#define ZLIB_VER_SUBREVISION 4
4646

4747
/*
4848
The 'zlib' compression library provides in-memory compression and

‎zlib.pc.in

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
prefix=@prefix@
22
exec_prefix=@exec_prefix@
33
libdir=@libdir@
4+
sharedlibdir=@sharedlibdir@
45
includedir=@includedir@
56

67
Name: zlib
78
Description: zlib compression library
89
Version: @VERSION@
910

1011
Requires:
11-
Libs: -L${libdir} -lz
12+
Libs: -L${libdir} -L${sharedlibdir} -lz
1213
Cflags: -I${includedir}

0 commit comments

Comments
 (0)
Please sign in to comment.