From ad9ae098612856bceb94a7713056f3b061db3848 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 19 Oct 2007 12:19:42 +0000 Subject: [PATCH] zlib: cleanup and sync with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2924 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/zlib/files/autotools.patch | 651 +++++++++++ meta/packages/zlib/files/visibility.patch | 236 ++-- meta/packages/zlib/files/zlib_1.2.2-8.diff.gz | Bin 15553 -> 0 bytes .../packages/zlib/zlib-1.2.3/visibility.patch | 1034 ----------------- meta/packages/zlib/zlib-native_1.2.3.bb | 12 +- meta/packages/zlib/zlib_1.2.3.bb | 15 +- 6 files changed, 790 insertions(+), 1158 deletions(-) create mode 100644 meta/packages/zlib/files/autotools.patch delete mode 100644 meta/packages/zlib/files/zlib_1.2.2-8.diff.gz delete mode 100644 meta/packages/zlib/zlib-1.2.3/visibility.patch diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch new file mode 100644 index 0000000000..d1dc8dd8d4 --- /dev/null +++ b/meta/packages/zlib/files/autotools.patch @@ -0,0 +1,651 @@ +diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure +--- zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200 ++++ zlib-1.2.3new/configure 1970-01-01 01:00:00.000000000 +0100 +@@ -1,459 +0,0 @@ +-#!/bin/sh +-# configure script for zlib. This script is needed only if +-# you wish to build a shared library and your system supports them, +-# of if you need special compiler, flags or install directory. +-# Otherwise, you can just use directly "make test; make install" +-# +-# To create a shared library, use "configure --shared"; by default a static +-# library is created. If the primitive shared library support provided here +-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz +-# +-# To impose specific compiler or flags or install directory, use for example: +-# prefix=$HOME CC=cc CFLAGS="-O4" ./configure +-# or for csh/tcsh users: +-# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) +-# LDSHARED is the command to be used to create a shared library +- +-# Incorrect settings of CC or CFLAGS may prevent creating a shared library. +-# If you have problems, try without defining CC and CFLAGS before reporting +-# an error. +- +-LIBS=libz.a +-LDFLAGS="-L. ${LIBS}" +-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` +-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` +-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` +-AR=${AR-"ar rc"} +-RANLIB=${RANLIB-"ranlib"} +-prefix=${prefix-/usr/local} +-exec_prefix=${exec_prefix-'${prefix}'} +-libdir=${libdir-'${exec_prefix}/lib'} +-includedir=${includedir-'${prefix}/include'} +-mandir=${mandir-'${prefix}/share/man'} +-shared_ext='.so' +-shared=0 +-gcc=0 +-old_cc="$CC" +-old_cflags="$CFLAGS" +- +-while test $# -ge 1 +-do +-case "$1" in +- -h* | --h*) +- echo 'usage:' +- echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' +- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' +- exit 0;; +- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; +- -p* | --p*) prefix="$2"; shift; shift;; +- -e* | --e*) exec_prefix="$2"; shift; shift;; +- -l* | --l*) libdir="$2"; shift; shift;; +- -i* | --i*) includedir="$2"; shift; shift;; +- -s* | --s*) shared=1; shift;; +- *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; +- esac +-done +- +-test=ztest$$ +-cat > $test.c </dev/null; then +- CC="$cc" +- SFLAGS=${CFLAGS-"-fPIC -O3"} +- CFLAGS="$cflags" +- case `(uname -s || echo unknown) 2>/dev/null` in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; +- CYGWIN* | Cygwin* | cygwin* | OS/2* ) +- EXE='.exe';; +- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 +- # (alain.bonnefoy@icbt.com) +- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; +- HP-UX*) +- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- Darwin*) shared_ext='.dylib' +- SHAREDLIB=libz$shared_ext +- SHAREDLIBV=libz.$VER$shared_ext +- SHAREDLIBM=libz.$VER1$shared_ext +- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; +- *) LDSHARED=${LDSHARED-"$cc -shared"};; +- esac +-else +- # find system name and corresponding cc options +- CC=${CC-cc} +- case `(uname -sr || echo unknown) 2>/dev/null` in +- HP-UX*) SFLAGS=${CFLAGS-"-O +z"} +- CFLAGS=${CFLAGS-"-O"} +-# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} +- LDSHARED=${LDSHARED-"ld -b"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- ia64) +- shared_ext='.so' +- SHAREDLIB='libz.so';; +- *) +- shared_ext='.sl' +- SHAREDLIB='libz.sl';; +- esac;; +- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} +- CFLAGS=${CFLAGS-"-ansi -O2"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; +- OSF1*) SFLAGS=${CFLAGS-"-O -std1"} +- CFLAGS=${CFLAGS-"-O -std1"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- QNX*) SFLAGS=${CFLAGS-"-4 -O"} +- CFLAGS=${CFLAGS-"-4 -O"} +- LDSHARED=${LDSHARED-"cc"} +- RANLIB=${RANLIB-"true"} +- AR="cc -A";; +- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} +- CFLAGS=${CFLAGS-"-O3"} +- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; +- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg89"} +- LDSHARED=${LDSHARED-"cc -G"};; +- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} +- CFLAGS=${CFLAGS-"-O2"} +- LDSHARED=${LDSHARED-"ld"};; +- SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} +- CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"} +- LDSHARED=${LDSHARED-"cc -xarch=v9b"};; +- UNIX_System_V\ 4.2.0) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- UNIX_SV\ 4.2MP) +- SFLAGS=${CFLAGS-"-Kconform_pic -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- OpenUNIX\ 5) +- SFLAGS=${CFLAGS-"-KPIC -O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -G"};; +- AIX*) # Courtesy of dbakker@arrayasolutions.com +- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} +- LDSHARED=${LDSHARED-"xlc -G"};; +- # send working options for other systems to support@gzip.org +- *) SFLAGS=${CFLAGS-"-O"} +- CFLAGS=${CFLAGS-"-O"} +- LDSHARED=${LDSHARED-"cc -shared"};; +- esac +-fi +- +-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} +-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} +-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} +- +-if test $shared -eq 1; then +- echo Checking for shared library support... +- # we must test in two steps (cc then ld), required at least on SunOS 4.x +- if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && +- test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then +- CFLAGS="$SFLAGS" +- LIBS="$SHAREDLIBV" +- echo Building shared library $SHAREDLIBV with $CC. +- elif test -z "$old_cc" -a -z "$old_cflags"; then +- echo No shared library support. +- shared=0; +- else +- echo 'No shared library support; try without defining CC and CFLAGS' +- shared=0; +- fi +-fi +-if test $shared -eq 0; then +- LDSHARED="$CC" +- echo Building static library $LIBS version $VER with $CC. +-else +- LDFLAGS="-L. ${SHAREDLIBV}" +-fi +- +-cat > $test.c < +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h +- echo "Checking for unistd.h... Yes." +-else +- cp -p zconf.in.h zconf.h +- echo "Checking for unistd.h... No." +-fi +- +-cat > $test.c < +-#include +-#include "zconf.h" +- +-int main() +-{ +-#ifndef STDC +- choke me +-#endif +- +- return 0; +-} +-EOF +- +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()" +- +- cat > $test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return 0; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for vsnprintf() in stdio.h... Yes." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsnprintf(buf, sizeof(buf), fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsnprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsnprintf_void" +- echo "Checking for return value of vsnprintf()... No." +- echo " WARNING: apparently vsnprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_vsnprintf" +- echo "Checking for vsnprintf() in stdio.h... No." +- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +-#include +- +-int mytest(char *fmt, ...) +-{ +- int n; +- char buf[20]; +- va_list ap; +- +- va_start(ap, fmt); +- n = vsprintf(buf, fmt, ap); +- va_end(ap); +- return n; +-} +- +-int main() +-{ +- return (mytest("Hello%d\n", 1)); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of vsprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_vsprintf_void" +- echo "Checking for return value of vsprintf()... No." +- echo " WARNING: apparently vsprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-else +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- snprintf(buf, sizeof(buf), "%s", "foo"); +- return 0; +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for snprintf() in stdio.h... Yes." +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- return snprintf(buf, sizeof(buf), "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of snprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_snprintf_void" +- echo "Checking for return value of snprintf()... No." +- echo " WARNING: apparently snprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- else +- CFLAGS="$CFLAGS -DNO_snprintf" +- echo "Checking for snprintf() in stdio.h... No." +- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" +- echo " can build but will be open to possible buffer-overflow security" +- echo " vulnerabilities." +- +- cat >$test.c < +- +-int mytest() +-{ +- char buf[20]; +- +- return sprintf(buf, "%s", "foo"); +-} +- +-int main() +-{ +- return (mytest()); +-} +-EOF +- +- if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for return value of sprintf()... Yes." +- else +- CFLAGS="$CFLAGS -DHAS_sprintf_void" +- echo "Checking for return value of sprintf()... No." +- echo " WARNING: apparently sprintf() does not return a value. zlib" +- echo " can build but will be open to possible string-format security" +- echo " vulnerabilities." +- fi +- fi +-fi +- +-cat >$test.c < +-int main() { return 0; } +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- echo "Checking for errno.h... Yes." +-else +- echo "Checking for errno.h... No." +- CFLAGS="$CFLAGS -DNO_ERRNO_H" +-fi +- +-cat > $test.c < +-#include +-#include +-caddr_t hello() { +- return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0); +-} +-EOF +-if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then +- CFLAGS="$CFLAGS -DUSE_MMAP" +- echo Checking for mmap support... Yes. +-else +- echo Checking for mmap support... No. +-fi +- +-CPP=${CPP-"$CC -E"} +-case $CFLAGS in +- *ASMV*) +- if test "`nm $test.o | grep _hello`" = ""; then +- CPP="$CPP -DNO_UNDERLINE" +- echo Checking for underline in external names... No. +- else +- echo Checking for underline in external names... Yes. +- fi;; +-esac +- +-rm -f $test.[co] $test $test$shared_ext +- +-# udpate Makefile +-sed < Makefile.in " +-/^CC *=/s#=.*#=$CC# +-/^CFLAGS *=/s#=.*#=$CFLAGS# +-/^CPP *=/s#=.*#=$CPP# +-/^LDSHARED *=/s#=.*#=$LDSHARED# +-/^LIBS *=/s#=.*#=$LIBS# +-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# +-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# +-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# +-/^AR *=/s#=.*#=$AR# +-/^RANLIB *=/s#=.*#=$RANLIB# +-/^EXE *=/s#=.*#=$EXE# +-/^prefix *=/s#=.*#=$prefix# +-/^exec_prefix *=/s#=.*#=$exec_prefix# +-/^libdir *=/s#=.*#=$libdir# +-/^includedir *=/s#=.*#=$includedir# +-/^mandir *=/s#=.*#=$mandir# +-/^LDFLAGS *=/s#=.*#=$LDFLAGS# +-" > Makefile +diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac +--- zlib-1.2.3/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ zlib-1.2.3new/configure.ac 2006-08-07 20:38:31.612402750 +0200 +@@ -0,0 +1,14 @@ ++AC_INIT(zlib,1.2.3) ++AC_CONFIG_SRCDIR(adler32.c) ++AM_INIT_AUTOMAKE(zlibs,1.2.3) ++ ++AC_PREREQ([2.59]) ++ ++AC_PROG_CC([gcc]) ++AC_PROG_LIBTOOL ++ ++AC_HEADER_STDC ++ ++AC_CONFIG_FILES([Makefile]) ++ ++AC_OUTPUT +diff -Naur zlib-1.2.3/Makefile.am zlib-1.2.3new/Makefile.am +--- zlib-1.2.3/Makefile.am 2006/10/14 05:35:40 1.1 ++++ zlib-1.2.3new/Makefile.am 2006/10/14 05:36:49 +@@ -0,0 +1,8 @@ ++lib_LTLIBRARIES = libz.la ++ ++libz_la_SOURCES = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c \ ++ trees.c zutil.c inflate.c infback.c inftrees.c inffast.c ++ ++libz_la_LDFLAGS = -version-number 1:2:3 ++ ++include_HEADERS = zconf.h zlib.h +diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in +--- zlib-1.2.3/Makefile.in 2005-07-18 04:25:21.000000000 +0200 ++++ zlib-1.2.3new/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,154 +0,0 @@ +-# Makefile for zlib +-# Copyright (C) 1995-2005 Jean-loup Gailly. +-# For conditions of distribution and use, see copyright notice in zlib.h +- +-# To compile and test, type: +-# ./configure; make test +-# The call of configure is optional if you don't have special requirements +-# If you wish to build zlib as a shared library, use: ./configure -s +- +-# To use the asm code, type: +-# cp contrib/asm?86/match.S ./match.S +-# make LOC=-DASMV OBJA=match.o +- +-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: +-# make install +-# To install in $HOME instead of /usr/local, use: +-# make install prefix=$HOME +- +-CC=cc +- +-CFLAGS=-O +-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +-#CFLAGS=-g -DDEBUG +-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +-# -Wstrict-prototypes -Wmissing-prototypes +- +-LDFLAGS=libz.a +-LDSHARED=$(CC) +-CPP=$(CC) -E +- +-LIBS=libz.a +-SHAREDLIB=libz.so +-SHAREDLIBV=libz.so.1.2.3 +-SHAREDLIBM=libz.so.1 +- +-AR=ar rc +-RANLIB=ranlib +-TAR=tar +-SHELL=/bin/sh +-EXE= +- +-prefix = /usr/local +-exec_prefix = ${prefix} +-libdir = ${exec_prefix}/lib +-includedir = ${prefix}/include +-mandir = ${prefix}/share/man +-man3dir = ${mandir}/man3 +- +-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +- zutil.o inflate.o infback.o inftrees.o inffast.o +- +-OBJA = +-# to use the asm code: make OBJA=match.o +- +-TEST_OBJS = example.o minigzip.o +- +-all: example$(EXE) minigzip$(EXE) +- +-check: test +-test: all +- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- echo hello world | ./minigzip | ./minigzip -d || \ +- echo ' *** minigzip test FAILED ***' ; \ +- if ./example; then \ +- echo ' *** zlib test OK ***'; \ +- else \ +- echo ' *** zlib test FAILED ***'; \ +- fi +- +-libz.a: $(OBJS) $(OBJA) +- $(AR) $@ $(OBJS) $(OBJA) +- -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 +- +-match.o: match.S +- $(CPP) match.S > _match.s +- $(CC) -c _match.s +- mv _match.o match.o +- rm -f _match.s +- +-$(SHAREDLIBV): $(OBJS) +- $(LDSHARED) -o $@ $(OBJS) +- rm -f $(SHAREDLIB) $(SHAREDLIBM) +- ln -s $@ $(SHAREDLIB) +- ln -s $@ $(SHAREDLIBM) +- +-example$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) +- +-minigzip$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) +- +-install: $(LIBS) +- -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi +- -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi +- -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi +- -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi +- cp zlib.h zconf.h $(includedir) +- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h +- cp $(LIBS) $(libdir) +- cd $(libdir); chmod 755 $(LIBS) +- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(libdir); if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIB) $(SHAREDLIBM); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIB); \ +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ +- (ldconfig || true) >/dev/null 2>&1; \ +- fi +- cp zlib.3 $(man3dir) +- chmod 644 $(man3dir)/zlib.3 +-# The ranlib in install is needed on NeXTSTEP which checks file times +-# ldconfig is for Linux +- +-uninstall: +- cd $(includedir); \ +- cd $(libdir); rm -f libz.a; \ +- if test -f $(SHAREDLIBV); then \ +- rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ +- fi +- cd $(man3dir); rm -f zlib.3 +- +-mostlyclean: clean +-clean: +- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ +- libz.* foo.gz so_locations \ +- _match.s maketree contrib/infback9/*.o +- +-maintainer-clean: distclean +-distclean: clean +- cp -p Makefile.in Makefile +- cp -p zconf.in.h zconf.h +- rm -f .DS_Store +- +-tags: +- etags *.[ch] +- +-depend: +- makedepend -- $(CFLAGS) -- *.[ch] +- +-# DO NOT DELETE THIS LINE -- make depend depends on it. +- +-adler32.o: zlib.h zconf.h +-compress.o: zlib.h zconf.h +-crc32.o: crc32.h zlib.h zconf.h +-deflate.o: deflate.h zutil.h zlib.h zconf.h +-example.o: zlib.h zconf.h +-gzio.o: zutil.h zlib.h zconf.h +-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +-inftrees.o: zutil.h zlib.h zconf.h inftrees.h +-minigzip.o: zlib.h zconf.h +-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +-uncompr.o: zlib.h zconf.h +-zutil.o: zutil.h zlib.h zconf.h diff --git a/meta/packages/zlib/files/visibility.patch b/meta/packages/zlib/files/visibility.patch index ba1a2a6fef..a4e7ae907a 100644 --- a/meta/packages/zlib/files/visibility.patch +++ b/meta/packages/zlib/files/visibility.patch @@ -1,6 +1,11 @@ ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/adler32.c 2003-11-17 15:24:27.000000000 -0600 -+++ zlib-1.2.2/adler32.c 2005-02-28 19:04:09.000000000 -0600 -@@ -44,7 +44,7 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- zlib-1.2.3-orig/adler32.c~visibility ++++ zlib-1.2.3-orig/adler32.c +@@ -54,7 +54,7 @@ #endif /* ========================================================================= */ @@ -9,8 +14,8 @@ uLong adler; const Bytef *buf; uInt len; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/compress.c 2003-07-07 00:37:56.000000000 -0500 -+++ zlib-1.2.2/compress.c 2005-02-28 19:04:09.000000000 -0600 +--- zlib-1.2.3-orig/compress.c~visibility ++++ zlib-1.2.3-orig/compress.c @@ -19,7 +19,7 @@ memory, Z_BUF_ERROR if there was not enough room in the output buffer, Z_STREAM_ERROR if the level parameter is invalid. @@ -38,9 +43,9 @@ uLong sourceLen; { return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/crc32.c 2004-10-03 21:29:30.000000000 -0500 -+++ zlib-1.2.2/crc32.c 2005-02-28 19:04:09.000000000 -0600 -@@ -198,7 +198,7 @@ +--- zlib-1.2.3-orig/crc32.c~visibility ++++ zlib-1.2.3-orig/crc32.c +@@ -202,7 +202,7 @@ /* ========================================================================= * This function can be used by asm versions of crc32() */ @@ -49,7 +54,7 @@ { #ifdef DYNAMIC_CRC_TABLE if (crc_table_empty) -@@ -212,7 +212,7 @@ +@@ -216,7 +216,7 @@ #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 /* ========================================================================= */ @@ -58,8 +63,8 @@ unsigned long crc; const unsigned char FAR *buf; unsigned len; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/deflate.c 2004-09-15 09:28:14.000000000 -0500 -+++ zlib-1.2.2/deflate.c 2005-02-28 19:04:09.000000000 -0600 +--- zlib-1.2.3-orig/deflate.c~visibility ++++ zlib-1.2.3-orig/deflate.c @@ -201,7 +201,7 @@ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); @@ -78,7 +83,7 @@ version, stream_size) z_streamp strm; int level; -@@ -311,7 +311,7 @@ +@@ -312,7 +312,7 @@ } /* ========================================================================= */ @@ -87,7 +92,7 @@ z_streamp strm; const Bytef *dictionary; uInt dictLength; -@@ -355,7 +355,7 @@ +@@ -354,7 +354,7 @@ } /* ========================================================================= */ @@ -96,7 +101,7 @@ z_streamp strm; { deflate_state *s; -@@ -391,7 +391,7 @@ +@@ -401,7 +401,7 @@ } /* ========================================================================= */ @@ -105,7 +110,7 @@ z_streamp strm; int bits; int value; -@@ -403,7 +403,7 @@ +@@ -413,7 +413,7 @@ } /* ========================================================================= */ @@ -114,7 +119,7 @@ z_streamp strm; int level; int strategy; -@@ -457,7 +457,7 @@ +@@ -486,7 +486,7 @@ * But even the conservative upper bound of about 14% expansion does not * seem onerous for output buffer allocation. */ @@ -123,7 +128,7 @@ z_streamp strm; uLong sourceLen; { -@@ -520,7 +520,7 @@ +@@ -549,7 +549,7 @@ } /* ========================================================================= */ @@ -132,7 +137,7 @@ z_streamp strm; int flush; { -@@ -696,7 +696,7 @@ +@@ -856,7 +856,7 @@ } /* ========================================================================= */ @@ -141,7 +146,7 @@ z_streamp strm; { int status; -@@ -726,7 +726,7 @@ +@@ -891,7 +891,7 @@ * To simplify the source, this is not supported for 16-bit MSDOS (which * doesn't have enough memory anyway to duplicate compression states). */ @@ -150,8 +155,8 @@ z_streamp dest; z_streamp source; { ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/gzio.c 2004-10-03 21:30:37.000000000 -0500 -+++ zlib-1.2.2/gzio.c 2005-02-28 19:06:11.000000000 -0600 +--- zlib-1.2.3-orig/gzio.c~visibility ++++ zlib-1.2.3-orig/gzio.c @@ -205,7 +205,7 @@ /* =========================================================================== Opens a gzip (.gz) file for reading or writing. @@ -305,7 +310,7 @@ gzFile file; { gz_stream *s = (gz_stream*)file; -@@ -938,7 +938,7 @@ +@@ -950,7 +950,7 @@ Flushes all pending output if necessary, closes the compressed file and deallocates all the (de)compression state. */ @@ -313,8 +318,8 @@ +ZEXPORT int gzclose (file) gzFile file; { - int err; -@@ -967,7 +967,7 @@ + gz_stream *s = (gz_stream*)file; +@@ -984,7 +984,7 @@ errnum is set to Z_ERRNO and the application may consult errno to get the exact error code. */ @@ -323,7 +328,7 @@ gzFile file; int *errnum; { -@@ -997,7 +997,7 @@ +@@ -1014,7 +1014,7 @@ /* =========================================================================== Clear the error and end-of-file flags, and do the same for the real file. */ @@ -332,37 +337,37 @@ gzFile file; { gz_stream *s = (gz_stream*)file; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/infback.c 2004-10-03 21:31:20.000000000 -0500 -+++ zlib-1.2.2/infback.c 2005-02-28 19:04:09.000000000 -0600 +--- zlib-1.2.3-orig/infback.c~visibility ++++ zlib-1.2.3-orig/infback.c @@ -25,7 +25,7 @@ windowBits is in the range 8..15, and window is a user-supplied window and output buffer that is 2**windowBits bytes. */ -int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) +ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size) - z_stream FAR *strm; + z_streamp strm; int windowBits; unsigned char FAR *window; -@@ -237,7 +237,7 @@ +@@ -238,7 +238,7 @@ inflateBack() can also return Z_STREAM_ERROR if the input parameters are not correct, i.e. strm is Z_NULL or the state was not initialized. */ -int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) +ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc) - z_stream FAR *strm; + z_streamp strm; in_func in; void FAR *in_desc; -@@ -610,7 +610,7 @@ +@@ -611,7 +611,7 @@ return ret; } -int ZEXPORT inflateBackEnd(strm) +ZEXPORT int inflateBackEnd(strm) - z_stream FAR *strm; + z_streamp strm; { if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/inflate.c 2004-10-03 21:33:51.000000000 -0500 -+++ zlib-1.2.2/inflate.c 2005-02-28 19:04:09.000000000 -0600 +--- zlib-1.2.3-orig/inflate.c~visibility ++++ zlib-1.2.3-orig/inflate.c @@ -100,7 +100,7 @@ local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, unsigned len)); @@ -372,7 +377,7 @@ z_streamp strm; { struct inflate_state FAR *state; -@@ -122,7 +122,7 @@ +@@ -141,7 +141,7 @@ return Z_OK; } @@ -381,7 +386,7 @@ z_streamp strm; int windowBits; const char *version; -@@ -165,7 +165,7 @@ +@@ -184,7 +184,7 @@ return inflateReset(strm); } @@ -390,7 +395,7 @@ z_streamp strm; const char *version; int stream_size; -@@ -532,7 +532,7 @@ +@@ -551,7 +551,7 @@ will return Z_BUF_ERROR if it has not reached the end of the stream. */ @@ -399,7 +404,7 @@ z_streamp strm; int flush; { -@@ -1085,7 +1085,7 @@ +@@ -1152,7 +1152,7 @@ return ret; } @@ -408,7 +413,7 @@ z_streamp strm; { struct inflate_state FAR *state; -@@ -1099,7 +1099,7 @@ +@@ -1166,7 +1166,7 @@ return Z_OK; } @@ -417,7 +422,7 @@ z_streamp strm; const Bytef *dictionary; uInt dictLength; -@@ -1171,7 +1171,7 @@ +@@ -1259,7 +1259,7 @@ return next; } @@ -426,7 +431,7 @@ z_streamp strm; { unsigned len; /* number of bytes to look at or looked at */ -@@ -1222,7 +1222,7 @@ +@@ -1310,7 +1310,7 @@ block. When decompressing, PPP checks that at the end of input packet, inflate is waiting for these length bytes. */ @@ -435,7 +440,7 @@ z_streamp strm; { struct inflate_state FAR *state; -@@ -1232,7 +1232,7 @@ +@@ -1320,7 +1320,7 @@ return state->mode == STORED && state->bits == 0; } @@ -444,8 +449,8 @@ z_streamp dest; z_streamp source; { ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/uncompr.c 2003-07-07 00:36:56.000000000 -0500 -+++ zlib-1.2.2/uncompr.c 2005-02-28 19:04:09.000000000 -0600 +--- zlib-1.2.3-orig/uncompr.c~visibility ++++ zlib-1.2.3-orig/uncompr.c @@ -23,7 +23,7 @@ enough memory, Z_BUF_ERROR if there was not enough room in the output buffer, or Z_DATA_ERROR if the input data was corrupted. @@ -455,9 +460,9 @@ Bytef *dest; uLongf *destLen; const Bytef *source; ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zconf.in.h 2004-05-30 15:38:00.000000000 -0500 -+++ zlib-1.2.2/zconf.in.h 2005-02-28 19:04:09.000000000 -0600 -@@ -198,11 +198,9 @@ +--- zlib-1.2.3-orig/zconf.in.h~visibility ++++ zlib-1.2.3-orig/zconf.in.h +@@ -204,11 +204,9 @@ */ # ifdef ZLIB_DLL # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) @@ -472,7 +477,7 @@ # endif # endif /* ZLIB_DLL */ /* If building or using zlib with the WINAPI/WINAPIV calling convention, -@@ -223,30 +221,45 @@ +@@ -229,30 +227,45 @@ # define ZEXPORTVA FAR CDECL # endif # endif @@ -534,9 +539,9 @@ #ifndef FAR # define FAR #endif ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zlib.h 2004-10-03 21:57:26.000000000 -0500 -+++ zlib-1.2.2/zlib.h 2005-02-28 19:04:09.000000000 -0600 -@@ -184,7 +184,7 @@ +--- zlib-1.2.3-orig/zlib.h~visibility ++++ zlib-1.2.3-orig/zlib.h +@@ -209,7 +209,7 @@ /* basic functions */ @@ -545,7 +550,7 @@ /* The application can compare zlibVersion and ZLIB_VERSION for consistency. If the first character differs, the library code actually used is not compatible with the zlib.h header file used by the application. -@@ -192,7 +192,7 @@ +@@ -217,7 +217,7 @@ */ /* @@ -554,7 +559,7 @@ Initializes the internal stream state for compression. The fields zalloc, zfree and opaque must be initialized before by the caller. -@@ -214,7 +214,7 @@ +@@ -239,7 +239,7 @@ */ @@ -563,7 +568,7 @@ /* deflate compresses as much data as possible, and stops when the input buffer becomes empty or the output buffer becomes full. It may introduce some -@@ -296,7 +296,7 @@ +@@ -325,7 +325,7 @@ */ @@ -572,7 +577,7 @@ /* All dynamically allocated data structures for this stream are freed. This function discards any unprocessed input and does not flush any -@@ -311,7 +311,7 @@ +@@ -340,7 +340,7 @@ /* @@ -581,7 +586,7 @@ Initializes the internal stream state for decompression. The fields next_in, avail_in, zalloc, zfree and opaque must be initialized before by -@@ -331,7 +331,7 @@ +@@ -360,7 +360,7 @@ */ @@ -590,7 +595,7 @@ /* inflate decompresses as much data as possible, and stops when the input buffer becomes empty or the output buffer becomes full. It may introduce -@@ -430,7 +430,7 @@ +@@ -459,7 +459,7 @@ */ @@ -599,7 +604,7 @@ /* All dynamically allocated data structures for this stream are freed. This function discards any unprocessed input and does not flush any -@@ -448,7 +448,7 @@ +@@ -477,7 +477,7 @@ */ /* @@ -608,7 +613,7 @@ int level, int method, int windowBits, -@@ -504,7 +504,7 @@ +@@ -535,7 +535,7 @@ not perform any compression: this will be done by deflate(). */ @@ -617,7 +622,7 @@ const Bytef *dictionary, uInt dictLength)); /* -@@ -541,7 +541,7 @@ +@@ -574,7 +574,7 @@ perform any compression: this will be done by deflate(). */ @@ -626,7 +631,7 @@ z_streamp source)); /* Sets the destination stream as a complete copy of the source stream. -@@ -559,7 +559,7 @@ +@@ -592,7 +592,7 @@ destination. */ @@ -635,7 +640,7 @@ /* This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate all the internal compression state. -@@ -570,7 +570,7 @@ +@@ -603,7 +603,7 @@ stream state was inconsistent (such as zalloc or state being NULL). */ @@ -644,16 +649,16 @@ int level, int strategy)); /* -@@ -591,7 +591,7 @@ - if strm->avail_out was zero. - */ +@@ -641,7 +641,7 @@ + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ -ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, +ZEXTERN ZEXPORT uLong deflateBound OF((z_streamp strm, uLong sourceLen)); /* deflateBound() returns an upper bound on the compressed size after -@@ -600,7 +600,7 @@ +@@ -650,7 +650,7 @@ for deflation in a single pass, and so would be called before deflate(). */ @@ -662,7 +667,7 @@ int bits, int value)); /* -@@ -617,7 +617,7 @@ +@@ -691,7 +691,7 @@ */ /* @@ -671,8 +676,8 @@ int windowBits)); This is another version of inflateInit with an extra parameter. The -@@ -659,7 +659,7 @@ - modified, but next_out and avail_out are unchanged.) +@@ -733,7 +733,7 @@ + and avail_out are unchanged.) */ -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, @@ -680,7 +685,7 @@ const Bytef *dictionary, uInt dictLength)); /* -@@ -678,7 +678,7 @@ +@@ -755,7 +755,7 @@ inflate(). */ @@ -689,7 +694,7 @@ /* Skips invalid compressed data until a full flush point (see above the description of deflate with Z_FULL_FLUSH) can be found, or until all -@@ -693,7 +693,7 @@ +@@ -770,7 +770,7 @@ until success or end of the input data. */ @@ -698,7 +703,7 @@ z_streamp source)); /* Sets the destination stream as a complete copy of the source stream. -@@ -709,7 +709,7 @@ +@@ -786,7 +786,7 @@ destination. */ @@ -707,34 +712,34 @@ /* This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate all the internal decompression state. -@@ -720,7 +720,7 @@ +@@ -853,7 +853,7 @@ */ /* --ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit OF((z_stream FAR *strm, int windowBits, +-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, ++ZEXTERN ZEXPORT int inflateBackInit OF((z_streamp strm, int windowBits, unsigned char FAR *window)); Initialize the internal stream state for decompression using inflateBack() -@@ -744,7 +744,7 @@ +@@ -877,7 +877,7 @@ typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); --ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm, -+ZEXTERN ZEXPORT int inflateBack OF((z_stream FAR *strm, +-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, ++ZEXTERN ZEXPORT int inflateBack OF((z_streamp strm, in_func in, void FAR *in_desc, out_func out, void FAR *out_desc)); /* -@@ -813,7 +813,7 @@ +@@ -946,7 +946,7 @@ that inflateBack() cannot return Z_OK. */ --ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm)); -+ZEXTERN ZEXPORT int inflateBackEnd OF((z_stream FAR *strm)); +-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); ++ZEXTERN ZEXPORT int inflateBackEnd OF((z_streamp strm)); /* All memory allocated by inflateBackInit() is freed. -@@ -821,7 +821,7 @@ +@@ -954,7 +954,7 @@ state was inconsistent. */ @@ -743,7 +748,7 @@ /* Return flags indicating compile-time options. Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: -@@ -873,7 +873,7 @@ +@@ -1006,7 +1006,7 @@ utility functions can easily be modified if you need special options. */ @@ -752,7 +757,7 @@ const Bytef *source, uLong sourceLen)); /* Compresses the source buffer into the destination buffer. sourceLen is -@@ -888,7 +888,7 @@ +@@ -1021,7 +1021,7 @@ buffer. */ @@ -761,7 +766,7 @@ const Bytef *source, uLong sourceLen, int level)); /* -@@ -904,14 +904,14 @@ +@@ -1037,14 +1037,14 @@ Z_STREAM_ERROR if the level parameter is invalid. */ @@ -778,7 +783,7 @@ const Bytef *source, uLong sourceLen)); /* Decompresses the source buffer into the destination buffer. sourceLen is -@@ -932,7 +932,7 @@ +@@ -1065,7 +1065,7 @@ typedef voidp gzFile; @@ -787,7 +792,7 @@ /* Opens a gzip (.gz) file for reading or writing. The mode parameter is as in fopen ("rb" or "wb") but can also include a compression level -@@ -949,7 +949,7 @@ +@@ -1082,7 +1082,7 @@ can be checked to distinguish the two cases (if errno is zero, the zlib error is Z_MEM_ERROR). */ @@ -796,7 +801,7 @@ /* gzdopen() associates a gzFile with the file descriptor fd. File descriptors are obtained from calls like open, dup, creat, pipe or -@@ -962,7 +962,7 @@ +@@ -1095,7 +1095,7 @@ the (de)compression state. */ @@ -805,7 +810,7 @@ /* Dynamically update the compression level or strategy. See the description of deflateInit2 for the meaning of these parameters. -@@ -970,7 +970,7 @@ +@@ -1103,7 +1103,7 @@ opened for writing. */ @@ -814,7 +819,7 @@ /* Reads the given number of uncompressed bytes from the compressed file. If the input file was not in gzip format, gzread copies the given number -@@ -978,7 +978,7 @@ +@@ -1111,7 +1111,7 @@ gzread returns the number of uncompressed bytes actually read (0 for end of file, -1 for error). */ @@ -823,7 +828,7 @@ voidpc buf, unsigned len)); /* Writes the given number of uncompressed bytes into the compressed file. -@@ -986,7 +986,7 @@ +@@ -1119,7 +1119,7 @@ (0 in case of error). */ @@ -832,7 +837,7 @@ /* Converts, formats, and writes the args to the compressed file under control of the format string, as in fprintf. gzprintf returns the number of -@@ -999,14 +999,14 @@ +@@ -1132,14 +1132,14 @@ because the secure snprintf() or vsnprintf() functions were not available. */ @@ -849,7 +854,7 @@ /* Reads bytes from the compressed file until len-1 characters are read, or a newline character is read and transferred to buf, or an end-of-file -@@ -1015,19 +1015,19 @@ +@@ -1148,19 +1148,19 @@ gzgets returns buf, or Z_NULL in case of error. */ @@ -872,7 +877,7 @@ /* Push one character back onto the stream to be read again later. Only one character of push-back is allowed. gzungetc() returns the -@@ -1037,7 +1037,7 @@ +@@ -1170,7 +1170,7 @@ or gzrewind(). */ @@ -881,7 +886,7 @@ /* Flushes all pending output into the compressed file. The parameter flush is as in the deflate() function. The return value is the zlib -@@ -1047,7 +1047,7 @@ +@@ -1180,7 +1180,7 @@ degrade compression. */ @@ -890,7 +895,7 @@ z_off_t offset, int whence)); /* Sets the starting position for the next gzread or gzwrite on the -@@ -1065,14 +1065,14 @@ +@@ -1198,14 +1198,14 @@ would be before the current position. */ @@ -907,7 +912,7 @@ /* Returns the starting position for the next gzread or gzwrite on the given compressed file. This position represents a number of bytes in the -@@ -1081,20 +1081,20 @@ +@@ -1214,26 +1214,26 @@ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) */ @@ -918,6 +923,13 @@ input stream, otherwise zero. */ +-ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); ++ZEXTERN ZEXPORT int gzdirect OF((gzFile file)); + /* + Returns 1 if file is being read directly without decompression, otherwise + zero. + */ + -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); +ZEXTERN ZEXPORT int gzclose OF((gzFile file)); /* @@ -931,7 +943,7 @@ /* Returns the error message for the last error which occurred on the given compressed file. errnum is set to zlib error number. If an -@@ -1103,7 +1103,7 @@ +@@ -1242,7 +1242,7 @@ to get the exact error code. */ @@ -940,25 +952,25 @@ /* Clears the error and end-of-file flags for file. This is analogous to the clearerr() function in stdio. This is useful for continuing to read a gzip -@@ -1118,7 +1118,7 @@ +@@ -1257,7 +1257,7 @@ compression library. */ -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); +ZEXTERN ZEXPORT uLong adler32 OF((uLong adler, const Bytef *buf, uInt len)); - /* Update a running Adler-32 checksum with the bytes buf[0..len-1] and -@@ -1135,7 +1135,7 @@ - if (adler != original_adler) error(); + return the updated checksum. If buf is NULL, this function returns +@@ -1282,7 +1282,7 @@ + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. */ -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +ZEXTERN ZEXPORT uLong crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* - Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the required initial value -@@ -1157,17 +1157,17 @@ + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is NULL, this function returns the required initial +@@ -1314,17 +1314,17 @@ /* deflateInit and inflateInit are macros to allow checking the zlib version * and the compiler's view of z_stream: */ @@ -976,12 +988,12 @@ -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, +ZEXTERN ZEXPORT int inflateInit2_ OF((z_streamp strm, int windowBits, const char *version, int stream_size)); --ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit_ OF((z_stream FAR *strm, int windowBits, +-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, ++ZEXTERN ZEXPORT int inflateBackInit_ OF((z_streamp strm, int windowBits, unsigned char FAR *window, const char *version, int stream_size)); -@@ -1189,9 +1189,9 @@ +@@ -1346,9 +1346,9 @@ struct internal_state {int dummy;}; /* hack for buggy compilers */ #endif @@ -994,9 +1006,9 @@ #ifdef __cplusplus } ---- tmp/work/arm-linux-uclibc/zlib-1.2.2-r5/zlib-1.2.2/zutil.c 2003-08-27 21:34:34.000000000 -0500 -+++ zlib-1.2.2/zutil.c 2005-02-28 19:04:09.000000000 -0600 -@@ -28,12 +28,12 @@ +--- zlib-1.2.3-orig/zutil.c~visibility ++++ zlib-1.2.3-orig/zutil.c +@@ -24,12 +24,12 @@ ""}; @@ -1011,7 +1023,7 @@ { uLong flags; -@@ -134,7 +134,7 @@ +@@ -130,7 +130,7 @@ /* exported to allow conversion of error code to string for compress() and * uncompress() */ diff --git a/meta/packages/zlib/files/zlib_1.2.2-8.diff.gz b/meta/packages/zlib/files/zlib_1.2.2-8.diff.gz deleted file mode 100644 index c8501419733bf5a80c900d1925267fa8db82c252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15553 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 12) + (sourceLen >> 14) + 11; ---- zlib-1.2.3-orig/crc32.c~visibility -+++ zlib-1.2.3-orig/crc32.c -@@ -202,7 +202,7 @@ - /* ========================================================================= - * This function can be used by asm versions of crc32() - */ --const unsigned long FAR * ZEXPORT get_crc_table() -+ZEXPORT const unsigned long FAR * get_crc_table() - { - #ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) -@@ -216,7 +216,7 @@ - #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - - /* ========================================================================= */ --unsigned long ZEXPORT crc32(crc, buf, len) -+ZEXPORT unsigned long crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; ---- zlib-1.2.3-orig/deflate.c~visibility -+++ zlib-1.2.3-orig/deflate.c -@@ -201,7 +201,7 @@ - zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); - - /* ========================================================================= */ --int ZEXPORT deflateInit_(strm, level, version, stream_size) -+ZEXPORT int deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; -@@ -213,7 +213,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, -+ZEXPORT int deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; -@@ -312,7 +312,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) -+ZEXPORT int deflateSetDictionary (strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -@@ -354,7 +354,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateReset (strm) -+ZEXPORT int deflateReset (strm) - z_streamp strm; - { - deflate_state *s; -@@ -401,7 +401,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflatePrime (strm, bits, value) -+ZEXPORT int deflatePrime (strm, bits, value) - z_streamp strm; - int bits; - int value; -@@ -413,7 +413,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateParams(strm, level, strategy) -+ZEXPORT int deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; -@@ -486,7 +486,7 @@ - * But even the conservative upper bound of about 14% expansion does not - * seem onerous for output buffer allocation. - */ --uLong ZEXPORT deflateBound(strm, sourceLen) -+ZEXPORT uLong deflateBound(strm, sourceLen) - z_streamp strm; - uLong sourceLen; - { -@@ -549,7 +549,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflate (strm, flush) -+ZEXPORT int deflate (strm, flush) - z_streamp strm; - int flush; - { -@@ -856,7 +856,7 @@ - } - - /* ========================================================================= */ --int ZEXPORT deflateEnd (strm) -+ZEXPORT int deflateEnd (strm) - z_streamp strm; - { - int status; -@@ -891,7 +891,7 @@ - * To simplify the source, this is not supported for 16-bit MSDOS (which - * doesn't have enough memory anyway to duplicate compression states). - */ --int ZEXPORT deflateCopy (dest, source) -+ZEXPORT int deflateCopy (dest, source) - z_streamp dest; - z_streamp source; - { ---- zlib-1.2.3-orig/gzio.c~visibility -+++ zlib-1.2.3-orig/gzio.c -@@ -205,7 +205,7 @@ - /* =========================================================================== - Opens a gzip (.gz) file for reading or writing. - */ --gzFile ZEXPORT gzopen (path, mode) -+ZEXPORT gzFile gzopen (path, mode) - const char *path; - const char *mode; - { -@@ -216,7 +216,7 @@ - Associate a gzFile with the file descriptor fd. fd is not dup'ed here - to mimic the behavio(u)r of fdopen. - */ --gzFile ZEXPORT gzdopen (fd, mode) -+ZEXPORT gzFile gzdopen (fd, mode) - int fd; - const char *mode; - { -@@ -231,7 +231,7 @@ - /* =========================================================================== - * Update the compression level and strategy - */ --int ZEXPORT gzsetparams (file, level, strategy) -+ZEXPORT int gzsetparams (file, level, strategy) - gzFile file; - int level; - int strategy; -@@ -391,7 +391,7 @@ - Reads the given number of uncompressed bytes from the compressed file. - gzread returns the number of bytes actually read (0 for end of file). - */ --int ZEXPORT gzread (file, buf, len) -+ZEXPORT int gzread (file, buf, len) - gzFile file; - voidp buf; - unsigned len; -@@ -500,7 +500,7 @@ - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. - */ --int ZEXPORT gzgetc(file) -+ZEXPORT int gzgetc(file) - gzFile file; - { - unsigned char c; -@@ -512,7 +512,7 @@ - /* =========================================================================== - Push one byte back onto the stream. - */ --int ZEXPORT gzungetc(c, file) -+ZEXPORT int gzungetc(c, file) - int c; - gzFile file; - { -@@ -537,7 +537,7 @@ - - The current implementation is not optimized at all. - */ --char * ZEXPORT gzgets(file, buf, len) -+ZEXPORT char * gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -@@ -556,7 +556,7 @@ - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of bytes actually written (0 in case of error). - */ --int ZEXPORT gzwrite (file, buf, len) -+ZEXPORT int gzwrite (file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -@@ -600,7 +600,7 @@ - #ifdef STDC - #include - --int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) -+ZEXPORTVA int gzprintf (gzFile file, const char *format, /* args */ ...) - { - char buf[Z_PRINTF_BUFSIZE]; - va_list va; -@@ -634,7 +634,7 @@ - } - #else /* not ANSI C */ - --int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, -+ZEXPORT intVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; -@@ -675,7 +675,7 @@ - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. - */ --int ZEXPORT gzputc(file, c) -+ZEXPORT int gzputc(file, c) - gzFile file; - int c; - { -@@ -690,7 +690,7 @@ - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. - */ --int ZEXPORT gzputs(file, s) -+ZEXPORT int gzputs(file, s) - gzFile file; - const char *s; - { -@@ -743,7 +743,7 @@ - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; - } - --int ZEXPORT gzflush (file, flush) -+ZEXPORT int gzflush (file, flush) - gzFile file; - int flush; - { -@@ -764,7 +764,7 @@ - SEEK_END is not implemented, returns error. - In this version of the library, gzseek can be extremely slow. - */ --z_off_t ZEXPORT gzseek (file, offset, whence) -+ZEXPORT z_off_t gzseek (file, offset, whence) - gzFile file; - z_off_t offset; - int whence; -@@ -854,7 +854,7 @@ - /* =========================================================================== - Rewinds input file. - */ --int ZEXPORT gzrewind (file) -+ZEXPORT int gzrewind (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -878,7 +878,7 @@ - given compressed file. This position represents a number of bytes in the - uncompressed data stream. - */ --z_off_t ZEXPORT gztell (file) -+ZEXPORT z_off_t gztell (file) - gzFile file; - { - return gzseek(file, 0L, SEEK_CUR); -@@ -888,7 +888,7 @@ - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. - */ --int ZEXPORT gzeof (file) -+ZEXPORT int gzeof (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -950,7 +950,7 @@ - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. - */ --int ZEXPORT gzclose (file) -+ZEXPORT int gzclose (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; -@@ -984,7 +984,7 @@ - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. - */ --const char * ZEXPORT gzerror (file, errnum) -+ZEXPORT const char * gzerror (file, errnum) - gzFile file; - int *errnum; - { -@@ -1014,7 +1014,7 @@ - /* =========================================================================== - Clear the error and end-of-file flags, and do the same for the real file. - */ --void ZEXPORT gzclearerr (file) -+ZEXPORT void gzclearerr (file) - gzFile file; - { - gz_stream *s = (gz_stream*)file; ---- zlib-1.2.3-orig/infback.c~visibility -+++ zlib-1.2.3-orig/infback.c -@@ -25,7 +25,7 @@ - windowBits is in the range 8..15, and window is a user-supplied - window and output buffer that is 2**windowBits bytes. - */ --int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -+ZEXPORT int inflateBackInit_(strm, windowBits, window, version, stream_size) - z_streamp strm; - int windowBits; - unsigned char FAR *window; -@@ -238,7 +238,7 @@ - inflateBack() can also return Z_STREAM_ERROR if the input parameters - are not correct, i.e. strm is Z_NULL or the state was not initialized. - */ --int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) -+ZEXPORT int inflateBack(strm, in, in_desc, out, out_desc) - z_streamp strm; - in_func in; - void FAR *in_desc; -@@ -611,7 +611,7 @@ - return ret; - } - --int ZEXPORT inflateBackEnd(strm) -+ZEXPORT int inflateBackEnd(strm) - z_streamp strm; - { - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) ---- zlib-1.2.3-orig/inflate.c~visibility -+++ zlib-1.2.3-orig/inflate.c -@@ -100,7 +100,7 @@ - local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, - unsigned len)); - --int ZEXPORT inflateReset(strm) -+ZEXPORT int inflateReset(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -141,7 +141,7 @@ - return Z_OK; - } - --int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) -+ZEXPORT int inflateInit2_(strm, windowBits, version, stream_size) - z_streamp strm; - int windowBits; - const char *version; -@@ -184,7 +184,7 @@ - return inflateReset(strm); - } - --int ZEXPORT inflateInit_(strm, version, stream_size) -+ZEXPORT int inflateInit_(strm, version, stream_size) - z_streamp strm; - const char *version; - int stream_size; -@@ -551,7 +551,7 @@ - will return Z_BUF_ERROR if it has not reached the end of the stream. - */ - --int ZEXPORT inflate(strm, flush) -+ZEXPORT int inflate(strm, flush) - z_streamp strm; - int flush; - { -@@ -1152,7 +1152,7 @@ - return ret; - } - --int ZEXPORT inflateEnd(strm) -+ZEXPORT int inflateEnd(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -1166,7 +1166,7 @@ - return Z_OK; - } - --int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) -+ZEXPORT int inflateSetDictionary(strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -@@ -1259,7 +1259,7 @@ - return next; - } - --int ZEXPORT inflateSync(strm) -+ZEXPORT int inflateSync(strm) - z_streamp strm; - { - unsigned len; /* number of bytes to look at or looked at */ -@@ -1310,7 +1310,7 @@ - block. When decompressing, PPP checks that at the end of input packet, - inflate is waiting for these length bytes. - */ --int ZEXPORT inflateSyncPoint(strm) -+ZEXPORT int inflateSyncPoint(strm) - z_streamp strm; - { - struct inflate_state FAR *state; -@@ -1320,7 +1320,7 @@ - return state->mode == STORED && state->bits == 0; - } - --int ZEXPORT inflateCopy(dest, source) -+ZEXPORT int inflateCopy(dest, source) - z_streamp dest; - z_streamp source; - { ---- zlib-1.2.3-orig/uncompr.c~visibility -+++ zlib-1.2.3-orig/uncompr.c -@@ -23,7 +23,7 @@ - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. - */ --int ZEXPORT uncompress (dest, destLen, source, sourceLen) -+ZEXPORT int uncompress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; ---- zlib-1.2.3-orig/zconf.in.h~visibility -+++ zlib-1.2.3-orig/zconf.in.h -@@ -204,11 +204,9 @@ - */ - # ifdef ZLIB_DLL - # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) --# ifdef ZLIB_INTERNAL --# define ZEXTERN extern __declspec(dllexport) --# else --# define ZEXTERN extern __declspec(dllimport) --# endif -+# define ZDLLLOCAL __declspec(dllimport) -+# define ZDLLPUBLIC __declspec(dllexport) -+# define ZEXTERN extern - # endif - # endif /* ZLIB_DLL */ - /* If building or using zlib with the WINAPI/WINAPIV calling convention, -@@ -229,30 +227,45 @@ - # define ZEXPORTVA FAR CDECL - # endif - # endif --#endif -- --#if defined (__BEOS__) -+#elif defined (__BEOS__) - # ifdef ZLIB_DLL --# ifdef ZLIB_INTERNAL --# define ZEXPORT __declspec(dllexport) --# define ZEXPORTVA __declspec(dllexport) --# else --# define ZEXPORT __declspec(dllimport) --# define ZEXPORTVA __declspec(dllimport) --# endif -+# define ZDLLIMPORT __declspec(dllimport) -+# define ZDLLPUBLIC __declspec(dllexport) -+# define ZDLLLOCAL -+# endif -+#else -+# define ZDLLIMPORT -+# ifdef GCC_HASCLASSVISIBILITY -+# define ZDLLLOCAL __attribute__ ((visibility("hidden"))) -+# define ZDLLPUBLIC __attribute__ ((visibility("default"))) -+# else -+# define ZDLLLOCAL -+# define ZDLLPUBLIC - # endif - #endif - - #ifndef ZEXTERN - # define ZEXTERN extern - #endif --#ifndef ZEXPORT --# define ZEXPORT --#endif --#ifndef ZEXPORTVA --# define ZEXPORTVA -+#ifdef ZLIB_INTERNAL -+# ifndef ZLIB_DLL -+# define ZEXPORT -+# define ZEXPORTVA -+# endif -+# ifndef ZEXPORT -+# define ZEXPORT ZDLLPUBLIC -+# endif -+# ifndef ZEXPORTVA -+# define ZEXPORTVA ZDLLPUBLIC -+# endif -+#else -+# ifndef ZEXPORT -+# define ZEXPORT ZDLLIMPORT -+# endif -+# ifndef ZEXPORTVA -+# define ZEXPORTVA ZDLLIMPORT -+# endif - #endif -- - #ifndef FAR - # define FAR - #endif ---- zlib-1.2.3-orig/zlib.h~visibility -+++ zlib-1.2.3-orig/zlib.h -@@ -209,7 +209,7 @@ - - /* basic functions */ - --ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -+ZEXTERN ZEXPORT const char * zlibVersion OF((void)); - /* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is - not compatible with the zlib.h header file used by the application. -@@ -217,7 +217,7 @@ - */ - - /* --ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); -+ZEXTERN ZEXPORT int deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. -@@ -239,7 +239,7 @@ - */ - - --ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); -+ZEXTERN ZEXPORT int deflate OF((z_streamp strm, int flush)); - /* - deflate compresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce some -@@ -325,7 +325,7 @@ - */ - - --ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -+ZEXTERN ZEXPORT int deflateEnd OF((z_streamp strm)); - /* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any -@@ -340,7 +340,7 @@ - - - /* --ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - next_in, avail_in, zalloc, zfree and opaque must be initialized before by -@@ -360,7 +360,7 @@ - */ - - --ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); -+ZEXTERN ZEXPORT int inflate OF((z_streamp strm, int flush)); - /* - inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce -@@ -459,7 +459,7 @@ - */ - - --ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateEnd OF((z_streamp strm)); - /* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any -@@ -477,7 +477,7 @@ - */ - - /* --ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, -@@ -535,7 +535,7 @@ - not perform any compression: this will be done by deflate(). - */ - --ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); - /* -@@ -574,7 +574,7 @@ - perform any compression: this will be done by deflate(). - */ - --ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, -+ZEXTERN ZEXPORT int deflateCopy OF((z_streamp dest, - z_streamp source)); - /* - Sets the destination stream as a complete copy of the source stream. -@@ -592,7 +592,7 @@ - destination. - */ - --ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); -+ZEXTERN ZEXPORT int deflateReset OF((z_streamp strm)); - /* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. -@@ -603,7 +603,7 @@ - stream state was inconsistent (such as zalloc or state being NULL). - */ - --ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflateParams OF((z_streamp strm, - int level, - int strategy)); - /* -@@ -641,7 +641,7 @@ - returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. - */ - --ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, -+ZEXTERN ZEXPORT uLong deflateBound OF((z_streamp strm, - uLong sourceLen)); - /* - deflateBound() returns an upper bound on the compressed size after -@@ -650,7 +650,7 @@ - for deflation in a single pass, and so would be called before deflate(). - */ - --ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, -+ZEXTERN ZEXPORT int deflatePrime OF((z_streamp strm, - int bits, - int value)); - /* -@@ -691,7 +691,7 @@ - */ - - /* --ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with an extra parameter. The -@@ -733,7 +733,7 @@ - and avail_out are unchanged.) - */ - --ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); - /* -@@ -755,7 +755,7 @@ - inflate(). - */ - --ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateSync OF((z_streamp strm)); - /* - Skips invalid compressed data until a full flush point (see above the - description of deflate with Z_FULL_FLUSH) can be found, or until all -@@ -770,7 +770,7 @@ - until success or end of the input data. - */ - --ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, -+ZEXTERN ZEXPORT int inflateCopy OF((z_streamp dest, - z_streamp source)); - /* - Sets the destination stream as a complete copy of the source stream. -@@ -786,7 +786,7 @@ - destination. - */ - --ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateReset OF((z_streamp strm)); - /* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. -@@ -853,7 +853,7 @@ - */ - - /* --ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() -@@ -877,7 +877,7 @@ - typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); - typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); - --ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); - /* -@@ -946,7 +946,7 @@ - that inflateBack() cannot return Z_OK. - */ - --ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); -+ZEXTERN ZEXPORT int inflateBackEnd OF((z_streamp strm)); - /* - All memory allocated by inflateBackInit() is freed. - -@@ -954,7 +954,7 @@ - state was inconsistent. - */ - --ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); -+ZEXTERN ZEXPORT uLong zlibCompileFlags OF((void)); - /* Return flags indicating compile-time options. - - Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: -@@ -1006,7 +1006,7 @@ - utility functions can easily be modified if you need special options. - */ - --ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, -+ZEXTERN ZEXPORT int compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - /* - Compresses the source buffer into the destination buffer. sourceLen is -@@ -1021,7 +1021,7 @@ - buffer. - */ - --ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, -+ZEXTERN ZEXPORT int compress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen, - int level)); - /* -@@ -1037,14 +1037,14 @@ - Z_STREAM_ERROR if the level parameter is invalid. - */ - --ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); -+ZEXTERN ZEXPORT uLong compressBound OF((uLong sourceLen)); - /* - compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before - a compress() or compress2() call to allocate the destination buffer. - */ - --ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, -+ZEXTERN ZEXPORT int uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); - /* - Decompresses the source buffer into the destination buffer. sourceLen is -@@ -1065,7 +1065,7 @@ - - typedef voidp gzFile; - --ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); -+ZEXTERN ZEXPORT gzFile gzopen OF((const char *path, const char *mode)); - /* - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb") but can also include a compression level -@@ -1082,7 +1082,7 @@ - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). */ - --ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); -+ZEXTERN ZEXPORT gzFile gzdopen OF((int fd, const char *mode)); - /* - gzdopen() associates a gzFile with the file descriptor fd. File - descriptors are obtained from calls like open, dup, creat, pipe or -@@ -1095,7 +1095,7 @@ - the (de)compression state. - */ - --ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); -+ZEXTERN ZEXPORT int gzsetparams OF((gzFile file, int level, int strategy)); - /* - Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. -@@ -1103,7 +1103,7 @@ - opened for writing. - */ - --ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -+ZEXTERN ZEXPORT int gzread OF((gzFile file, voidp buf, unsigned len)); - /* - Reads the given number of uncompressed bytes from the compressed file. - If the input file was not in gzip format, gzread copies the given number -@@ -1111,7 +1111,7 @@ - gzread returns the number of uncompressed bytes actually read (0 for - end of file, -1 for error). */ - --ZEXTERN int ZEXPORT gzwrite OF((gzFile file, -+ZEXTERN ZEXPORT int gzwrite OF((gzFile file, - voidpc buf, unsigned len)); - /* - Writes the given number of uncompressed bytes into the compressed file. -@@ -1119,7 +1119,7 @@ - (0 in case of error). - */ - --ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); -+ZEXTERN ZEXPORTVA int gzprintf OF((gzFile file, const char *format, ...)); - /* - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of -@@ -1132,14 +1132,14 @@ - because the secure snprintf() or vsnprintf() functions were not available. - */ - --ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); -+ZEXTERN ZEXPORT int gzputs OF((gzFile file, const char *s)); - /* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. - */ - --ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); -+ZEXTERN ZEXPORT char * gzgets OF((gzFile file, char *buf, int len)); - /* - Reads bytes from the compressed file until len-1 characters are read, or - a newline character is read and transferred to buf, or an end-of-file -@@ -1148,19 +1148,19 @@ - gzgets returns buf, or Z_NULL in case of error. - */ - --ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); -+ZEXTERN ZEXPORT int gzputc OF((gzFile file, int c)); - /* - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. - */ - --ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); -+ZEXTERN ZEXPORT int gzgetc OF((gzFile file)); - /* - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. - */ - --ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); -+ZEXTERN ZEXPORT int gzungetc OF((int c, gzFile file)); - /* - Push one character back onto the stream to be read again later. - Only one character of push-back is allowed. gzungetc() returns the -@@ -1170,7 +1170,7 @@ - or gzrewind(). - */ - --ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); -+ZEXTERN ZEXPORT int gzflush OF((gzFile file, int flush)); - /* - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. The return value is the zlib -@@ -1180,7 +1180,7 @@ - degrade compression. - */ - --ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, -+ZEXTERN ZEXPORT z_off_t gzseek OF((gzFile file, - z_off_t offset, int whence)); - /* - Sets the starting position for the next gzread or gzwrite on the -@@ -1198,14 +1198,14 @@ - would be before the current position. - */ - --ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -+ZEXTERN ZEXPORT int gzrewind OF((gzFile file)); - /* - Rewinds the given file. This function is supported only for reading. - - gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) - */ - --ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); -+ZEXTERN ZEXPORT z_off_t gztell OF((gzFile file)); - /* - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the -@@ -1214,26 +1214,26 @@ - gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) - */ - --ZEXTERN int ZEXPORT gzeof OF((gzFile file)); -+ZEXTERN ZEXPORT int gzeof OF((gzFile file)); - /* - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. - */ - --ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); -+ZEXTERN ZEXPORT int gzdirect OF((gzFile file)); - /* - Returns 1 if file is being read directly without decompression, otherwise - zero. - */ - --ZEXTERN int ZEXPORT gzclose OF((gzFile file)); -+ZEXTERN ZEXPORT int gzclose OF((gzFile file)); - /* - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. The return value is the zlib - error number (see function gzerror below). - */ - --ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); -+ZEXTERN ZEXPORT const char * gzerror OF((gzFile file, int *errnum)); - /* - Returns the error message for the last error which occurred on the - given compressed file. errnum is set to zlib error number. If an -@@ -1242,7 +1242,7 @@ - to get the exact error code. - */ - --ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); -+ZEXTERN ZEXPORT void gzclearerr OF((gzFile file)); - /* - Clears the error and end-of-file flags for file. This is analogous to the - clearerr() function in stdio. This is useful for continuing to read a gzip -@@ -1257,7 +1257,7 @@ - compression library. - */ - --ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); -+ZEXTERN ZEXPORT uLong adler32 OF((uLong adler, const Bytef *buf, uInt len)); - /* - Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is NULL, this function returns -@@ -1282,7 +1282,7 @@ - seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. - */ - --ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -+ZEXTERN ZEXPORT uLong crc32 OF((uLong crc, const Bytef *buf, uInt len)); - /* - Update a running CRC-32 with the bytes buf[0..len-1] and return the - updated CRC-32. If buf is NULL, this function returns the required initial -@@ -1314,17 +1314,17 @@ - /* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ --ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, -+ZEXTERN ZEXPORT int deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); --ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, -+ZEXTERN ZEXPORT int inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); --ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, -+ZEXTERN ZEXPORT int deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, - int strategy, const char *version, - int stream_size)); --ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, -+ZEXTERN ZEXPORT int inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); --ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, -+ZEXTERN ZEXPORT int inflateBackInit_ OF((z_streamp strm, int windowBits, - unsigned char FAR *window, - const char *version, - int stream_size)); -@@ -1346,9 +1346,9 @@ - struct internal_state {int dummy;}; /* hack for buggy compilers */ - #endif - --ZEXTERN const char * ZEXPORT zError OF((int)); --ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); --ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); -+ZEXTERN ZEXPORT const char * zError OF((int)); -+ZEXTERN ZEXPORT int inflateSyncPoint OF((z_streamp z)); -+ZEXTERN ZEXPORT const uLongf * get_crc_table OF((void)); - - #ifdef __cplusplus - } ---- zlib-1.2.3-orig/zutil.c~visibility -+++ zlib-1.2.3-orig/zutil.c -@@ -24,12 +24,12 @@ - ""}; - - --const char * ZEXPORT zlibVersion() -+ZEXPORT const char * zlibVersion() - { - return ZLIB_VERSION; - } - --uLong ZEXPORT zlibCompileFlags() -+ZEXPORT uLong zlibCompileFlags() - { - uLong flags; - -@@ -130,7 +130,7 @@ - /* exported to allow conversion of error code to string for compress() and - * uncompress() - */ --const char * ZEXPORT zError(err) -+ZEXPORT const char * zError(err) - int err; - { - return ERR_MSG(err); diff --git a/meta/packages/zlib/zlib-native_1.2.3.bb b/meta/packages/zlib/zlib-native_1.2.3.bb index 10ac3da045..8ad4a8c03c 100644 --- a/meta/packages/zlib/zlib-native_1.2.3.bb +++ b/meta/packages/zlib/zlib-native_1.2.3.bb @@ -1,5 +1,13 @@ SECTION = "libs" require zlib_${PV}.bb +ZLIB_EXTRA = "" inherit native -DEPENDS = "" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/zlib-${PV}', '${FILE_DIRNAME}/zlib', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +do_stage() { + install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h + install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + oe_libinstall -a -so libz ${STAGING_LIBDIR} +} + + +DEPENDS = "libtool-native" diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb index 6bb34ceaf0..629ee83efb 100644 --- a/meta/packages/zlib/zlib_1.2.3.bb +++ b/meta/packages/zlib/zlib_1.2.3.bb @@ -3,22 +3,17 @@ SECTION = "libs" PRIORITY = "required" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" +PR="r2" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ - file://visibility.patch;patch=1" + file://visibility.patch;patch=1 \ + file://autotools.patch;patch=1 " S = "${WORKDIR}/zlib-${PV}" -export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1" -LDFLAGS_append = " -L. -lz" -CFLAGS_prepend = "-fPIC -DZLIB_DLL " -AR_append = " rc" -EXTRA_OEMAKE = "" +DEPENDS = "libtool-cross" -do_compile() { - ./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir} - oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a -} +inherit autotools do_stage() { install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h -- 2.40.1