zlib: update to 1.2.4.

--HG--
extra : convert_revision : dce27edb812d97f87b6cbb7e7eefc6a854e149d5
This commit is contained in:
Juan RP 2010-03-16 22:38:46 +01:00
parent 291af37ef7
commit 9893c67399
3 changed files with 5 additions and 33 deletions

View file

@ -1,25 +0,0 @@
--- configure.orig 2008-10-26 00:36:04.000000000 +0200
+++ configure 2008-10-26 00:36:46.000000000 +0200
@@ -169,20 +169,9 @@ SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext
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
+ LIBS="libz.a $SHAREDLIBV"
+ echo Building static and shared library $SHAREDLIBV with $CC.
fi
if test $shared -eq 0; then
LDSHARED="$CC"

View file

@ -1,14 +1,12 @@
# Template build file for 'zlib' # Template build file for 'zlib'
pkgname=zlib pkgname=zlib
version=1.2.3 version=1.2.4
distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2" distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2"
build_style=configure build_style=configure
CFLAGS="-fPIC -DPIC" configure_args="--prefix=/usr --shared"
configure_args="-s"
make_install_args="prefix=$XBPS_DESTDIR/$pkgname-$version/usr"
short_desc="A compression/decompression Library" short_desc="A compression/decompression Library"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca checksum=d0fc3433bb3ff5bbf1d2db57a328c0be39ac4a74d4b39887af522acf7ecd5ecc
long_desc=" long_desc="
This is a general purpose data compression library. All the code This is a general purpose data compression library. All the code
is thread safe. The data format used by the library is described is thread safe. The data format used by the library is described
@ -16,5 +14,4 @@ long_desc="
base_chroot=yes base_chroot=yes
subpackages="zlib-devel" subpackages="zlib-devel"
Add_dependency run glibc Add_dependency run glibc

View file

@ -5,8 +5,6 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run glibc-devel Add_dependency run glibc-devel
Add_dependency run zlib Add_dependency run zlib
@ -14,5 +12,7 @@ do_install()
{ {
mkdir -p ${DESTDIR}/usr/lib mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/libz.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libz.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
} }