From 0f9c34a9723254d439239ab992893c4956711d53 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 25 Aug 2008 20:39:55 +0000 Subject: [PATCH] zlib: Upgrade from 1.2.3 to 1.2.3.3 to add 64 bit extensions and improve operation on recent 64 bit platforms git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5094 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/zlib/files/1.2.3.3.dfsg.patch.gz | Bin 0 -> 51163 bytes meta/packages/zlib/files/autotools.patch | 386 +++++++++++++----- meta/packages/zlib/files/visibility.patch | 383 ++++++++--------- meta/packages/zlib/zlib-native.inc | 5 +- meta/packages/zlib/zlib-sdk.inc | 5 +- meta/packages/zlib/zlib_1.2.3.bb | 8 +- 6 files changed, 470 insertions(+), 317 deletions(-) create mode 100644 meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz diff --git a/meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz b/meta/packages/zlib/files/1.2.3.3.dfsg.patch.gz new file mode 100644 index 0000000000000000000000000000000000000000..2afb60de8cb12c5bea0880313c07926e7fc202d0 GIT binary patch literal 51163 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≈F*XHFKdSObDaTJ-Mye+g0u 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 Dv>3KB literal 0 HcmV?d00001 diff --git a/meta/packages/zlib/files/autotools.patch b/meta/packages/zlib/files/autotools.patch index d1dc8dd8d4..d70c2f6892 100644 --- a/meta/packages/zlib/files/autotools.patch +++ b/meta/packages/zlib/files/autotools.patch @@ -1,7 +1,8 @@ -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 @@ +Index: zlib-1.2.3/configure +=================================================================== +--- zlib-1.2.3.orig/configure 2008-08-23 11:23:47.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,558 +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, @@ -27,7 +28,8 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -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"} +-AR=${AR-"ar"} +-AR_RC="${AR} rc" -RANLIB=${RANLIB-"ranlib"} -prefix=${prefix-/usr/local} -exec_prefix=${exec_prefix-'${prefix}'} @@ -35,7 +37,8 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -includedir=${includedir-'${prefix}/include'} -mandir=${mandir-'${prefix}/share/man'} -shared_ext='.so' --shared=0 +-shared=1 +-zprefix=0 -gcc=0 -old_cc="$CC" -old_cflags="$CFLAGS" @@ -43,20 +46,25 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -while test $# -ge 1 -do -case "$1" in -- -h* | --h*) +- -h* | --help) - echo 'usage:' - echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]' -- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' +- echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR] [--zprefix]' - exit 0;; -- -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; -- -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;; +- -e*=* | --eprefix=*) 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;; +- -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift;; +- -p* | --prefix) prefix="$2"; shift; shift;; +- -e* | --eprefix) exec_prefix="$2"; shift; shift;; +- -l* | --libdir) libdir="$2"; shift; shift;; +- -i* | --includedir) includedir="$2"; shift; shift;; +- -s* | --shared | --enable-shared) shared=1; shift;; +- -t | --static) shared=0; shift;; +- -z* | --zprefix) zprefix=1; shift;; +- --sysconfdir=*) echo "ignored option: --sysconfdir"; shift;; +- --localstatedir=*) echo "ignored option: --localstatedir"; shift;; - *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;; - esac -done @@ -77,10 +85,13 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure - -if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/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"};; +- SFLAGS="${CFLAGS-"-O3"} -fPIC" +- CFLAGS="${CFLAGS-"-O3"}" +- if test -z $uname; then +- uname=`(uname -s || echo unknown) 2>/dev/null` +- fi +- case "$uname" in +- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"};; - CYGWIN* | Cygwin* | cygwin* | OS/2* ) - EXE='.exe';; - QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 @@ -106,7 +117,10 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -else - # find system name and corresponding cc options - CC=${CC-cc} -- case `(uname -sr || echo unknown) 2>/dev/null` in +- if test -z $uname; then +- uname=`(uname -sr || echo unknown) 2>/dev/null` +- fi +- case "$uname" in - HP-UX*) SFLAGS=${CFLAGS-"-O +z"} - CFLAGS=${CFLAGS-"-O"} -# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} @@ -121,24 +135,30 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure - esac;; - IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} - CFLAGS=${CFLAGS-"-ansi -O2"} -- LDSHARED=${LDSHARED-"cc -shared"};; +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"};; - 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"};; +- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"};; - QNX*) SFLAGS=${CFLAGS-"-4 -O"} - CFLAGS=${CFLAGS-"-4 -O"} - LDSHARED=${LDSHARED-"cc"} - RANLIB=${RANLIB-"true"} -- AR="cc -A";; +- AR_RC="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\ 5*) LDSHARED=${LDSHARED-"cc -G"} +- case `(uname -m || echo unknown) 2>/dev/null` in +- i86*) +- SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."} +- CFLAGS=${CFLAGS-"-xpentium -fast"};; +- *) +- SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."} +- CFLAGS=${CFLAGS-"-fast -xcg92"};; +- esac;; - SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} - CFLAGS=${CFLAGS-"-O2"} - LDSHARED=${LDSHARED-"ld"};; @@ -177,22 +197,63 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure - # 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" +- LIBS="$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 Tested $CC -c $SFLAGS $test.c +- $CC -c $SFLAGS $test.c +- echo Tested $LDSHARED -o $test$shared_ext $test.o +- $LDSHARED -o $test$shared_ext $test.o - echo 'No shared library support; try without defining CC and CFLAGS' - shared=0; - fi -fi -if test $shared -eq 0; then - LDSHARED="$CC" +- ALL="allstatic" +- TEST="teststatic" - echo Building static library $LIBS version $VER with $CC. -else -- LDFLAGS="-L. ${SHAREDLIBV}" +- ALL="allstatic allshared" +- TEST="teststatic testshared" +-fi +- +-cat > zlibdefs.h << EOF +-/* zlibdefs.h -- compile-time definitions for the zlib compression library +- * Copyright (C) 1995-2006 Jean-loup Gailly. +- * For conditions of distribution and use, see copyright notice in zlib.h +- */ +- +-EOF +- +-cat > $test.c < +-off64_t dummy = 0; +-EOF +-if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2>&1`" = ""; then +- CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1" +- SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1" +- echo "Checking for off64_t... Yes." +- echo "Checking for fseeko... Yes." +-else +- echo "Checking for off64_t... No." +- cat > $test.c < +-int main(void) { +- fseeko(NULL, 0, 0); +- return 0; +-} +-EOF +- if test "`($CC $CFLAGS -o $test $test.c) 2>&1`" = ""; then +- echo "Checking for fseeko... Yes." +- else +- CFLAGS="${CFLAGS} -DNO_FSEEKO" +- SFLAGS="${SFLAGS} -DNO_FSEEKO" +- echo "Checking for fseeko... No." +- fi -fi - -cat > $test.c <&1`" = ""; then -- sed < zconf.in.h "/HAVE_UNISTD_H/s%0%1%" > zconf.h +- cat >> zlibdefs.h < /* for off_t */ +-#include /* for SEEK_* and off_t */ +-#ifdef VMS +-# include /* for off_t */ +-#endif +-#ifndef z_off_t +-# define z_off_t off_t +-#endif +-EOF - echo "Checking for unistd.h... Yes." -else -- cp -p zconf.in.h zconf.h - echo "Checking for unistd.h... No." -fi - +-if test $zprefix -eq 1; then +- sed < zconf.h "/#ifdef Z_PREFIX/s/def Z_PREFIX/ 1/" > zconf.temp.h +- mv zconf.temp.h zconf.h +- echo "Using z_ prefix on all symbols." +-fi +- -cat > $test.c < -#include @@ -223,7 +298,7 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -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()" +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." - - cat > $test.c < @@ -320,7 +395,7 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure - fi - fi -else -- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()" +- echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." - - cat >$test.c < @@ -445,13 +520,36 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -sed < Makefile.in " -/^CC *=/s#=.*#=$CC# -/^CFLAGS *=/s#=.*#=$CFLAGS# +-/^SFLAGS *=/s#=.*#=$SFLAGS# +-/^LDFLAGS *=/s#=.*#=$LDFLAGS# +-/^LDSHARED *=/s#=.*#=$LDSHARED# +-/^CPP *=/s#=.*#=$CPP# +-/^LIBS *=/s#=.*#=$LIBS# +-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# +-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# +-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# +-/^AR *=/s#=.*#=$AR_RC# +-/^RANLIB *=/s#=.*#=$RANLIB# +-/^EXE *=/s#=.*#=$EXE# +-/^prefix *=/s#=.*#=$prefix# +-/^exec_prefix *=/s#=.*#=$exec_prefix# +-/^libdir *=/s#=.*#=$libdir# +-/^includedir *=/s#=.*#=$includedir# +-/^mandir *=/s#=.*#=$mandir# +-/^all: */s#:.*#: $ALL# +-/^test: */s#:.*#: $TEST# +-" > Makefile +- +-sed < zlib.pc.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# +-/^AR *=/s#=.*#=$AR_RC# -/^RANLIB *=/s#=.*#=$RANLIB# -/^EXE *=/s#=.*#=$EXE# -/^prefix *=/s#=.*#=$prefix# @@ -460,11 +558,14 @@ diff -Naur zlib-1.2.3/configure zlib-1.2.3new/configure -/^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 @@ +-" | sed -e " +-s/\@VERSION\@/$VER/g; +-" > zlib.pc +Index: zlib-1.2.3/configure.ac +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ zlib-1.2.3/configure.ac 2008-08-23 12:01:15.000000000 +0100 +@@ -0,0 +1,48 @@ +AC_INIT(zlib,1.2.3) +AC_CONFIG_SRCDIR(adler32.c) +AM_INIT_AUTOMAKE(zlibs,1.2.3) @@ -476,27 +577,63 @@ diff -Naur zlib-1.2.3/configure.ac zlib-1.2.3new/configure.ac + +AC_HEADER_STDC + ++zlib_save_CPPFLAGS=$CPPFLAGS ++CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" ++AC_CHECK_TYPES(off64_t) ++CPPFLAGS=$zlib_save_CPPFLAGS ++ ++AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [ ++ zlib_cv_use_lfs64=yes ++ if test "$ac_cv_off64_t" = "yes"; then ++ zlib_cv_use_lfs64=yes ++ fi ++]) ++ ++if test "$zlib_cv_use_lfs64" = "yes"; then ++ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" ++ echo "eek" ++ #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE]) ++fi ++ ++cat > zlibdefs.h << EOF ++/* zlibdefs.h -- compile-time definitions for the zlib compression library ++ * Copyright (C) 1995-2006 Jean-loup Gailly. ++ * For conditions of distribution and use, see copyright notice in zlib.h ++ */ ++ ++#include /* for off_t */ ++#include /* for SEEK_* and off_t */ ++#ifdef VMS ++# include /* for off_t */ ++#endif ++#ifndef z_off_t ++# define z_off_t off_t ++#endif ++EOF ++ +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 +Index: zlib-1.2.3/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ zlib-1.2.3/Makefile.am 2008-08-23 11:23:47.000000000 +0100 @@ -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 ++libz_la_LDFLAGS = -version-number 1:2:3 --version-script zlib.map + -+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 @@ ++include_HEADERS = zconf.h zlib.h zlibdefs.h +Index: zlib-1.2.3/Makefile.in +=================================================================== +--- zlib-1.2.3.orig/Makefile.in 2008-08-23 11:23:47.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,215 +0,0 @@ -# Makefile for zlib --# Copyright (C) 1995-2005 Jean-loup Gailly. +-# Copyright (C) 1995-2006 Jean-loup Gailly. -# For conditions of distribution and use, see copyright notice in zlib.h - -# To compile and test, type: @@ -521,16 +658,18 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in -#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -# -Wstrict-prototypes -Wmissing-prototypes - +-SFLAGS=-O +- -LDFLAGS=libz.a -LDSHARED=$(CC) -CPP=$(CC) -E - -LIBS=libz.a -SHAREDLIB=libz.so --SHAREDLIBV=libz.so.1.2.3 +-SHAREDLIBV=libz.so.1.2.3.3 -SHAREDLIBM=libz.so.1 - --AR=ar rc +-AR=ar -RANLIB=ranlib -TAR=tar -SHELL=/bin/sh @@ -542,21 +681,28 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in -includedir = ${prefix}/include -mandir = ${prefix}/share/man -man3dir = ${mandir}/man3 +-pkgconfigdir = ${libdir}/pkgconfig - --OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ +-OBJC = 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 - +-OBJS = $(OBJC) $(OBJA) +- +-PIC_OBJS = $(OBJS:%.o=%.lo) +- -TEST_OBJS = example.o minigzip.o - --all: example$(EXE) minigzip$(EXE) +-allstatic: example$(EXE) minigzip$(EXE) - --check: test --test: all -- @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ -- echo hello world | ./minigzip | ./minigzip -d || \ +-allshared: examplesh$(EXE) minigzipsh$(EXE) +- +-all: allstatic allshared +- +-teststatic: allstatic +- @echo hello world | ./minigzip | ./minigzip -d || \ - echo ' *** minigzip test FAILED ***' ; \ - if ./example; then \ - echo ' *** zlib test OK ***'; \ @@ -564,8 +710,24 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in - echo ' *** zlib test FAILED ***'; \ - fi - --libz.a: $(OBJS) $(OBJA) -- $(AR) $@ $(OBJS) $(OBJA) +-testshared: allshared +- @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ +- DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ +- SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \ +- echo hello world | ./minigzipsh | ./minigzipsh -d || \ +- echo ' *** minigzip shared test FAILED ***' ; \ +- if ./examplesh; then \ +- echo ' *** zlib shared test OK ***'; \ +- else \ +- echo ' *** zlib shared test FAILED ***'; \ +- fi +- +-test: teststatic testshared +- +-check: test +- +-libz.a: $(OBJS) +- $(AR) $@ $(OBJS) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - -match.o: match.S @@ -574,8 +736,17 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in - mv _match.o match.o - rm -f _match.s - --$(SHAREDLIBV): $(OBJS) -- $(LDSHARED) -o $@ $(OBJS) +-match.lo: match.S +- $(CPP) match.S > _match.s +- $(CC) -c -fPIC _match.s +- mv _match.o match.lo +- rm -f _match.s +- +-%.lo: %.c +- $(CC) $(SFLAGS) -DPIC -c $< -o $@ +- +-$(SHAREDLIBV): $(PIC_OBJS) +- $(LDSHARED) -o $@ $(PIC_OBJS) -lc - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) @@ -586,46 +757,60 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in -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 \ +-examplesh$(EXE): example.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIB) +- +-minigzipsh$(EXE): minigzip.o $(LIBS) +- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIB) +- +-install-libs: $(LIBS) +- -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi +- -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi +- -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi +- -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi +- cp $(LIBS) $(DESTDIR)$(libdir) +- cd $(DESTDIR)$(libdir); chmod 755 $(LIBS) +- -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 +- cd $(DESTDIR)$(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 +- cp zlib.3 $(DESTDIR)$(man3dir) +- chmod 644 $(DESTDIR)$(man3dir)/zlib.3 +- cp zlib.pc $(DESTDIR)$(pkgconfigdir) +- chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc -# The ranlib in install is needed on NeXTSTEP which checks file times -# ldconfig is for Linux - +-install: install-libs +- -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi +- cp zlib.h zconf.h zlibdefs.h $(DESTDIR)$(includedir) +- chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h $(DESTDIR)$(includedir)/zlibdefs.h +- -uninstall: -- cd $(includedir); \ -- cd $(libdir); rm -f libz.a; \ +- cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h zlibdefs.h +- cd $(DESTDIR)$(libdir); rm -f libz.a; \ - if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ - fi -- cd $(man3dir); rm -f zlib.3 +- cd $(DESTDIR)$(man3dir); rm -f zlib.3 +- cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc - -mostlyclean: clean -clean: -- rm -f *.o *~ example$(EXE) minigzip$(EXE) \ +- rm -f *.o *.lo *~ \ +- example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(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 +- rm zlibdefs.h +- touch -r configure zlibdefs.h +- rm -f zlib.pc .DS_Store - -tags: - etags *.[ch] @@ -635,17 +820,30 @@ diff -Naur zlib-1.2.3/Makefile.in zlib-1.2.3new/Makefile.in - -# 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 +-adler32.o: zlib.h zconf.h zlibdefs.h +-compress.o: zlib.h zconf.h zlibdefs.h +-crc32.o: crc32.h zlib.h zconf.h zlibdefs.h +-deflate.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h +-example.o: zlib.h zconf.h zlibdefs.h +-gzio.o: zutil.h zlib.h zconf.h zlibdefs.h +-inffast.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h +-inflate.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h +-infback.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h +-inftrees.o: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h +-minigzip.o: zlib.h zconf.h zlibdefs.h +-trees.o: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h +-uncompr.o: zlib.h zconf.h zlibdefs.h +-zutil.o: zutil.h zlib.h zconf.h zlibdefs.h +- +-adler32.lo: zlib.h zconf.h zlibdefs.h +-compress.lo: zlib.h zconf.h zlibdefs.h +-crc32.lo: crc32.h zlib.h zconf.h zlibdefs.h +-deflate.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h +-gzio.lo: zutil.h zlib.h zconf.h zlibdefs.h +-inffast.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h +-inflate.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h +-infback.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h inflate.h inffast.h inffixed.h +-inftrees.lo: zutil.h zlib.h zconf.h zlibdefs.h inftrees.h +-trees.lo: deflate.h zutil.h zlib.h zconf.h zlibdefs.h trees.h +-uncompr.lo: zlib.h zconf.h zlibdefs.h +-zutil.lo: zutil.h zlib.h zconf.h zlibdefs.h diff --git a/meta/packages/zlib/files/visibility.patch b/meta/packages/zlib/files/visibility.patch index a4e7ae907a..2dee8e0fe2 100644 --- a/meta/packages/zlib/files/visibility.patch +++ b/meta/packages/zlib/files/visibility.patch @@ -3,9 +3,11 @@ # 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 @@ +Index: zlib-1.2.3/adler32.c +=================================================================== +--- zlib-1.2.3.orig/adler32.c 2008-08-23 11:17:43.000000000 +0100 ++++ zlib-1.2.3/adler32.c 2008-08-23 11:17:44.000000000 +0100 +@@ -63,7 +63,7 @@ #endif /* ========================================================================= */ @@ -14,8 +16,10 @@ uLong adler; const Bytef *buf; uInt len; ---- zlib-1.2.3-orig/compress.c~visibility -+++ zlib-1.2.3-orig/compress.c +Index: zlib-1.2.3/compress.c +=================================================================== +--- zlib-1.2.3.orig/compress.c 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/compress.c 2008-08-23 11:17:44.000000000 +0100 @@ -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. @@ -42,10 +46,12 @@ +ZEXPORT uLong compressBound (sourceLen) uLong sourceLen; { - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; ---- zlib-1.2.3-orig/crc32.c~visibility -+++ zlib-1.2.3-orig/crc32.c -@@ -202,7 +202,7 @@ + return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + +Index: zlib-1.2.3/crc32.c +=================================================================== +--- zlib-1.2.3.orig/crc32.c 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/crc32.c 2008-08-23 11:17:44.000000000 +0100 +@@ -208,7 +208,7 @@ /* ========================================================================= * This function can be used by asm versions of crc32() */ @@ -54,7 +60,7 @@ { #ifdef DYNAMIC_CRC_TABLE if (crc_table_empty) -@@ -216,7 +216,7 @@ +@@ -222,7 +222,7 @@ #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 /* ========================================================================= */ @@ -63,8 +69,10 @@ 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 +Index: zlib-1.2.3/deflate.c +=================================================================== +--- zlib-1.2.3.orig/deflate.c 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/deflate.c 2008-08-23 11:17:44.000000000 +0100 @@ -201,7 +201,7 @@ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); @@ -120,15 +128,15 @@ 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. + * 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 @@ +@@ -581,7 +581,7 @@ } /* ========================================================================= */ @@ -137,7 +145,7 @@ z_streamp strm; int flush; { -@@ -856,7 +856,7 @@ +@@ -888,7 +888,7 @@ } /* ========================================================================= */ @@ -146,7 +154,7 @@ z_streamp strm; { int status; -@@ -891,7 +891,7 @@ +@@ -923,7 +923,7 @@ * To simplify the source, this is not supported for 16-bit MSDOS (which * doesn't have enough memory anyway to duplicate compression states). */ @@ -155,9 +163,11 @@ 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 @@ +Index: zlib-1.2.3/gzio.c +=================================================================== +--- zlib-1.2.3.orig/gzio.c 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/gzio.c 2008-08-23 11:17:44.000000000 +0100 +@@ -233,7 +233,7 @@ /* =========================================================================== Opens a gzip (.gz) file for reading or writing. */ @@ -166,7 +176,7 @@ const char *path; const char *mode; { -@@ -216,7 +216,7 @@ +@@ -254,7 +254,7 @@ Associate a gzFile with the file descriptor fd. fd is not dup'ed here to mimic the behavio(u)r of fdopen. */ @@ -175,7 +185,7 @@ int fd; const char *mode; { -@@ -231,7 +231,7 @@ +@@ -269,7 +269,7 @@ /* =========================================================================== * Update the compression level and strategy */ @@ -184,7 +194,7 @@ gzFile file; int level; int strategy; -@@ -391,7 +391,7 @@ +@@ -430,7 +430,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). */ @@ -193,7 +203,7 @@ gzFile file; voidp buf; unsigned len; -@@ -500,7 +500,7 @@ +@@ -539,7 +539,7 @@ Reads one byte from the compressed file. gzgetc returns this byte or -1 in case of end of file or error. */ @@ -202,7 +212,7 @@ gzFile file; { unsigned char c; -@@ -512,7 +512,7 @@ +@@ -551,7 +551,7 @@ /* =========================================================================== Push one byte back onto the stream. */ @@ -211,7 +221,7 @@ int c; gzFile file; { -@@ -537,7 +537,7 @@ +@@ -576,7 +576,7 @@ The current implementation is not optimized at all. */ @@ -220,7 +230,7 @@ gzFile file; char *buf; int len; -@@ -556,7 +556,7 @@ +@@ -595,7 +595,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). */ @@ -229,7 +239,7 @@ gzFile file; voidpc buf; unsigned len; -@@ -600,7 +600,7 @@ +@@ -639,7 +639,7 @@ #ifdef STDC #include @@ -238,7 +248,7 @@ { char buf[Z_PRINTF_BUFSIZE]; va_list va; -@@ -634,7 +634,7 @@ +@@ -673,7 +673,7 @@ } #else /* not ANSI C */ @@ -247,7 +257,7 @@ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) gzFile file; const char *format; -@@ -675,7 +675,7 @@ +@@ -714,7 +714,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. */ @@ -256,7 +266,7 @@ gzFile file; int c; { -@@ -690,7 +690,7 @@ +@@ -729,7 +729,7 @@ the terminating null character. gzputs returns the number of characters written, or -1 in case of error. */ @@ -265,7 +275,7 @@ gzFile file; const char *s; { -@@ -743,7 +743,7 @@ +@@ -782,7 +782,7 @@ return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; } @@ -274,16 +284,16 @@ 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. +@@ -906,7 +906,7 @@ + /* =========================================================================== + Define external functions gzseek() and gzseek64() using local gz_seek(). */ -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 @@ +@@ -935,7 +935,7 @@ /* =========================================================================== Rewinds input file. */ @@ -292,7 +302,7 @@ gzFile file; { gz_stream *s = (gz_stream*)file; -@@ -878,7 +878,7 @@ +@@ -959,7 +959,7 @@ given compressed file. This position represents a number of bytes in the uncompressed data stream. */ @@ -301,7 +311,7 @@ gzFile file; { return gzseek(file, 0L, SEEK_CUR); -@@ -888,7 +888,7 @@ +@@ -982,7 +982,7 @@ Returns 1 when EOF has previously been detected reading the given input stream, otherwise zero. */ @@ -310,7 +320,7 @@ gzFile file; { gz_stream *s = (gz_stream*)file; -@@ -950,7 +950,7 @@ +@@ -1044,7 +1044,7 @@ Flushes all pending output if necessary, closes the compressed file and deallocates all the (de)compression state. */ @@ -319,7 +329,7 @@ gzFile file; { gz_stream *s = (gz_stream*)file; -@@ -984,7 +984,7 @@ +@@ -1078,7 +1078,7 @@ errnum is set to Z_ERRNO and the application may consult errno to get the exact error code. */ @@ -328,7 +338,7 @@ gzFile file; int *errnum; { -@@ -1014,7 +1014,7 @@ +@@ -1108,7 +1108,7 @@ /* =========================================================================== Clear the error and end-of-file flags, and do the same for the real file. */ @@ -337,8 +347,10 @@ gzFile file; { gz_stream *s = (gz_stream*)file; ---- zlib-1.2.3-orig/infback.c~visibility -+++ zlib-1.2.3-orig/infback.c +Index: zlib-1.2.3/infback.c +=================================================================== +--- zlib-1.2.3.orig/infback.c 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/infback.c 2008-08-23 11:17:44.000000000 +0100 @@ -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. @@ -366,8 +378,10 @@ 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 +Index: zlib-1.2.3/inflate.c +=================================================================== +--- zlib-1.2.3.orig/inflate.c 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/inflate.c 2008-08-23 11:17:44.000000000 +0100 @@ -100,7 +100,7 @@ local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, unsigned len)); @@ -377,7 +391,7 @@ z_streamp strm; { struct inflate_state FAR *state; -@@ -141,7 +141,7 @@ +@@ -142,7 +142,7 @@ return Z_OK; } @@ -386,7 +400,7 @@ z_streamp strm; int windowBits; const char *version; -@@ -184,7 +184,7 @@ +@@ -185,7 +185,7 @@ return inflateReset(strm); } @@ -395,7 +409,7 @@ z_streamp strm; const char *version; int stream_size; -@@ -551,7 +551,7 @@ +@@ -552,7 +552,7 @@ will return Z_BUF_ERROR if it has not reached the end of the stream. */ @@ -404,7 +418,7 @@ z_streamp strm; int flush; { -@@ -1152,7 +1152,7 @@ +@@ -1168,7 +1168,7 @@ return ret; } @@ -413,7 +427,7 @@ z_streamp strm; { struct inflate_state FAR *state; -@@ -1166,7 +1166,7 @@ +@@ -1182,7 +1182,7 @@ return Z_OK; } @@ -422,7 +436,7 @@ z_streamp strm; const Bytef *dictionary; uInt dictLength; -@@ -1259,7 +1259,7 @@ +@@ -1275,7 +1275,7 @@ return next; } @@ -431,7 +445,7 @@ z_streamp strm; { unsigned len; /* number of bytes to look at or looked at */ -@@ -1310,7 +1310,7 @@ +@@ -1326,7 +1326,7 @@ block. When decompressing, PPP checks that at the end of input packet, inflate is waiting for these length bytes. */ @@ -440,7 +454,7 @@ z_streamp strm; { struct inflate_state FAR *state; -@@ -1320,7 +1320,7 @@ +@@ -1336,7 +1336,7 @@ return state->mode == STORED && state->bits == 0; } @@ -449,8 +463,10 @@ z_streamp dest; z_streamp source; { ---- zlib-1.2.3-orig/uncompr.c~visibility -+++ zlib-1.2.3-orig/uncompr.c +Index: zlib-1.2.3/uncompr.c +=================================================================== +--- zlib-1.2.3.orig/uncompr.c 2003-07-07 06:36:56.000000000 +0100 ++++ zlib-1.2.3/uncompr.c 2008-08-23 11:17:44.000000000 +0100 @@ -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. @@ -460,88 +476,11 @@ 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 @@ +Index: zlib-1.2.3/zlib.h +=================================================================== +--- zlib-1.2.3.orig/zlib.h 2008-08-23 11:17:44.000000000 +0100 ++++ zlib-1.2.3/zlib.h 2008-08-23 11:23:26.000000000 +0100 +@@ -212,7 +212,7 @@ /* basic functions */ @@ -550,7 +489,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. -@@ -217,7 +217,7 @@ +@@ -220,7 +220,7 @@ */ /* @@ -559,7 +498,7 @@ Initializes the internal stream state for compression. The fields zalloc, zfree and opaque must be initialized before by the caller. -@@ -239,7 +239,7 @@ +@@ -242,7 +242,7 @@ */ @@ -568,7 +507,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 -@@ -325,7 +325,7 @@ +@@ -328,7 +328,7 @@ */ @@ -577,7 +516,7 @@ /* 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 @@ +@@ -343,7 +343,7 @@ /* @@ -586,7 +525,7 @@ 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 @@ +@@ -367,7 +367,7 @@ */ @@ -595,7 +534,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 -@@ -459,7 +459,7 @@ +@@ -466,7 +466,7 @@ */ @@ -604,7 +543,7 @@ /* 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 @@ +@@ -484,7 +484,7 @@ */ /* @@ -613,7 +552,7 @@ int level, int method, int windowBits, -@@ -535,7 +535,7 @@ +@@ -542,7 +542,7 @@ not perform any compression: this will be done by deflate(). */ @@ -622,7 +561,7 @@ const Bytef *dictionary, uInt dictLength)); /* -@@ -574,7 +574,7 @@ +@@ -581,7 +581,7 @@ perform any compression: this will be done by deflate(). */ @@ -631,7 +570,7 @@ z_streamp source)); /* Sets the destination stream as a complete copy of the source stream. -@@ -592,7 +592,7 @@ +@@ -599,7 +599,7 @@ destination. */ @@ -640,7 +579,7 @@ /* This function is equivalent to deflateEnd followed by deflateInit, but does not free and reallocate all the internal compression state. -@@ -603,7 +603,7 @@ +@@ -610,7 +610,7 @@ stream state was inconsistent (such as zalloc or state being NULL). */ @@ -649,7 +588,7 @@ int level, int strategy)); /* -@@ -641,7 +641,7 @@ +@@ -648,7 +648,7 @@ returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. */ @@ -658,8 +597,8 @@ 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(). +@@ -658,7 +658,7 @@ + called before deflate(). */ -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, @@ -667,7 +606,7 @@ int bits, int value)); /* -@@ -691,7 +691,7 @@ +@@ -699,7 +699,7 @@ */ /* @@ -676,8 +615,8 @@ int windowBits)); This is another version of inflateInit with an extra parameter. The -@@ -733,7 +733,7 @@ - and avail_out are unchanged.) +@@ -745,7 +745,7 @@ + that is deferred until inflate() is called. */ -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, @@ -685,7 +624,7 @@ const Bytef *dictionary, uInt dictLength)); /* -@@ -755,7 +755,7 @@ +@@ -767,7 +767,7 @@ inflate(). */ @@ -694,7 +633,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 -@@ -770,7 +770,7 @@ +@@ -782,7 +782,7 @@ until success or end of the input data. */ @@ -703,7 +642,7 @@ z_streamp source)); /* Sets the destination stream as a complete copy of the source stream. -@@ -786,7 +786,7 @@ +@@ -798,7 +798,7 @@ destination. */ @@ -712,7 +651,7 @@ /* This function is equivalent to inflateEnd followed by inflateInit, but does not free and reallocate all the internal decompression state. -@@ -853,7 +853,7 @@ +@@ -865,7 +865,7 @@ */ /* @@ -721,7 +660,7 @@ unsigned char FAR *window)); Initialize the internal stream state for decompression using inflateBack() -@@ -877,7 +877,7 @@ +@@ -889,7 +889,7 @@ typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); @@ -730,7 +669,7 @@ in_func in, void FAR *in_desc, out_func out, void FAR *out_desc)); /* -@@ -946,7 +946,7 @@ +@@ -958,7 +958,7 @@ that inflateBack() cannot return Z_OK. */ @@ -739,7 +678,7 @@ /* All memory allocated by inflateBackInit() is freed. -@@ -954,7 +954,7 @@ +@@ -966,7 +966,7 @@ state was inconsistent. */ @@ -748,7 +687,7 @@ /* Return flags indicating compile-time options. Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: -@@ -1006,7 +1006,7 @@ +@@ -1018,7 +1018,7 @@ utility functions can easily be modified if you need special options. */ @@ -757,7 +696,7 @@ const Bytef *source, uLong sourceLen)); /* Compresses the source buffer into the destination buffer. sourceLen is -@@ -1021,7 +1021,7 @@ +@@ -1033,7 +1033,7 @@ buffer. */ @@ -766,7 +705,7 @@ const Bytef *source, uLong sourceLen, int level)); /* -@@ -1037,14 +1037,14 @@ +@@ -1049,14 +1049,14 @@ Z_STREAM_ERROR if the level parameter is invalid. */ @@ -783,16 +722,7 @@ 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 @@ +@@ -1095,7 +1095,7 @@ can be checked to distinguish the two cases (if errno is zero, the zlib error is Z_MEM_ERROR). */ @@ -801,7 +731,7 @@ /* 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 @@ +@@ -1108,7 +1108,7 @@ the (de)compression state. */ @@ -810,7 +740,7 @@ /* Dynamically update the compression level or strategy. See the description of deflateInit2 for the meaning of these parameters. -@@ -1103,7 +1103,7 @@ +@@ -1116,7 +1116,7 @@ opened for writing. */ @@ -819,7 +749,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 -@@ -1111,7 +1111,7 @@ +@@ -1124,7 +1124,7 @@ gzread returns the number of uncompressed bytes actually read (0 for end of file, -1 for error). */ @@ -828,7 +758,7 @@ voidpc buf, unsigned len)); /* Writes the given number of uncompressed bytes into the compressed file. -@@ -1119,7 +1119,7 @@ +@@ -1132,7 +1132,7 @@ (0 in case of error). */ @@ -837,7 +767,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 -@@ -1132,14 +1132,14 @@ +@@ -1145,14 +1145,14 @@ because the secure snprintf() or vsnprintf() functions were not available. */ @@ -854,7 +784,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 -@@ -1148,19 +1148,19 @@ +@@ -1161,19 +1161,19 @@ gzgets returns buf, or Z_NULL in case of error. */ @@ -877,7 +807,7 @@ /* 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 @@ +@@ -1183,7 +1183,7 @@ or gzrewind(). */ @@ -886,38 +816,21 @@ /* 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 @@ +@@ -1212,7 +1212,7 @@ would be before the current position. */ -ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -+ZEXTERN ZEXPORT int 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 @@ +@@ -1229,19 +1229,19 @@ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) */ -ZEXTERN int ZEXPORT gzeof OF((gzFile file)); -+ZEXTERN ZEXPORT int 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. @@ -931,11 +844,12 @@ */ -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); -+ZEXTERN ZEXPORT int 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). +@@ -1249,7 +1249,7 @@ + file, since its structures have been deallocated. */ -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); @@ -943,8 +857,8 @@ /* 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. +@@ -1261,7 +1261,7 @@ + this function may invalidate the returned string. */ -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); @@ -952,7 +866,7 @@ /* 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 @@ +@@ -1276,7 +1276,7 @@ compression library. */ @@ -961,7 +875,7 @@ /* 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 @@ +@@ -1302,7 +1302,7 @@ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. */ @@ -970,7 +884,7 @@ /* 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 @@ +@@ -1334,17 +1334,17 @@ /* deflateInit and inflateInit are macros to allow checking the zlib version * and the compiler's view of z_stream: */ @@ -993,21 +907,58 @@ unsigned char FAR *window, const char *version, int stream_size)); -@@ -1346,9 +1346,9 @@ +@@ -1362,11 +1362,11 @@ + ZLIB_VERSION, sizeof(z_stream)) + + #ifdef _LARGEFILE64_SOURCE +- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); +- ZEXTERN off64_t ZEXPORT gzseek64 OF((gzFile, off64_t, int)); +- ZEXTERN off64_t ZEXPORT gztell64 OF((gzFile)); +- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, off64_t)); +- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, off64_t)); ++ ZEXTERN ZEXPORT gzFile gzopen64 OF((const char *, const char *)); ++ ZEXTERN ZEXPORT off64_t gzseek64 OF((gzFile, off64_t, int)); ++ ZEXTERN ZEXPORT off64_t gztell64 OF((gzFile)); ++ ZEXTERN ZEXPORT uLong adler32_combine64 OF((uLong, uLong, off64_t)); ++ ZEXTERN ZEXPORT uLong crc32_combine64 OF((uLong, uLong, off64_t)); + #endif + + #if _FILE_OFFSET_BITS == 64 +@@ -1376,21 +1376,21 @@ + # define adler32_combine adler32_combine64 + # define crc32_combine crc32_combine64 + #else +- ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); +- ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); +- ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); +- ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); +- ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); ++ ZEXTERN ZEXPORT gzFile gzopen OF((const char *, const char *)); ++ ZEXTERN ZEXPORT z_off_t gzseek OF((gzFile, z_off_t, int)); ++ ZEXTERN ZEXPORT z_off_t gztell OF((gzFile)); ++ ZEXTERN ZEXPORT uLong adler32_combine OF((uLong, uLong, z_off_t)); ++ ZEXTERN ZEXPORT uLong crc32_combine OF((uLong, uLong, z_off_t)); + #endif + + #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) 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 int ZEXPORT inflateSyncPoint OF((z_streamp)); -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)); +-ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); ++ZEXTERN ZEXPORT const char * zError OF((int)); ++ZEXTERN ZEXPORT int inflateSyncPoint OF((z_streamp)); ++ZEXTERN ZEXPORT const uLongf * get_crc_table OF((void)); ++ZEXTERN ZEXPORT int inflateUndermine OF((z_streamp, int)); #ifdef __cplusplus } ---- zlib-1.2.3-orig/zutil.c~visibility -+++ zlib-1.2.3-orig/zutil.c +Index: zlib-1.2.3/zutil.c +=================================================================== +--- zlib-1.2.3.orig/zutil.c 2005-06-13 01:37:49.000000000 +0100 ++++ zlib-1.2.3/zutil.c 2008-08-23 11:17:44.000000000 +0100 @@ -24,12 +24,12 @@ ""}; diff --git a/meta/packages/zlib/zlib-native.inc b/meta/packages/zlib/zlib-native.inc index 290ee98b32..2228710e8f 100644 --- a/meta/packages/zlib/zlib-native.inc +++ b/meta/packages/zlib/zlib-native.inc @@ -2,8 +2,9 @@ ZLIB_EXTRA = "" inherit native do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + install -m 0644 zlib.h ${STAGING_INCDIR}/ + install -m 0644 zconf.h ${STAGING_INCDIR}/ + install -m 0644 zlibdefs.h ${STAGING_INCDIR}/ oe_libinstall -a -so libz ${STAGING_LIBDIR} } diff --git a/meta/packages/zlib/zlib-sdk.inc b/meta/packages/zlib/zlib-sdk.inc index a5901300ee..992f0c34f0 100644 --- a/meta/packages/zlib/zlib-sdk.inc +++ b/meta/packages/zlib/zlib-sdk.inc @@ -3,7 +3,8 @@ inherit sdk do_stage() { install -d ${STAGING_INCDIR} - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + install -m 0644 zlib.h ${STAGING_INCDIR}/ + install -m 0644 zconf.h ${STAGING_INCDIR}/ + install -m 0644 zlibdefs.h ${STAGING_INCDIR}/ oe_libinstall -a -so libz ${STAGING_LIBDIR} } diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb index 69f78687f2..eeb6f3f5bb 100644 --- a/meta/packages/zlib/zlib_1.2.3.bb +++ b/meta/packages/zlib/zlib_1.2.3.bb @@ -3,9 +3,10 @@ SECTION = "libs" PRIORITY = "required" HOMEPAGE = "http://www.gzip.org/zlib/" LICENSE = "zlib" -PR = "r2" +PR = "r4" SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ + file://1.2.3.3.dfsg.patch.gz;patch=1 \ file://visibility.patch;patch=1 \ file://autotools.patch;patch=1 " @@ -16,8 +17,9 @@ DEPENDS = "libtool-cross" inherit autotools do_stage() { - install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h - install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h + install -m 0644 zlib.h ${STAGING_INCDIR}/ + install -m 0644 zconf.h ${STAGING_INCDIR}/ + install -m 0644 zlibdefs.h ${STAGING_INCDIR}/ oe_libinstall -a -so libz ${STAGING_LIBDIR} } -- 2.40.1