summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-03-18 12:36:07 +0000
committerMike Frysinger <vapier@gentoo.org>2008-03-18 12:36:07 +0000
commit83ccaa61a24297cb1850ea82877810add1f286b5 (patch)
tree998f5db3397bc5cc94c0ceca1e048e23a1382405 /sys-libs/zlib
parentDrop frivolous USE=build. (diff)
downloadgentoo-2-83ccaa61a24297cb1850ea82877810add1f286b5.tar.gz
gentoo-2-83ccaa61a24297cb1850ea82877810add1f286b5.tar.bz2
gentoo-2-83ccaa61a24297cb1850ea82877810add1f286b5.zip
old
(Portage version: 2.2_pre2)
Diffstat (limited to 'sys-libs/zlib')
-rw-r--r--sys-libs/zlib/files/zlib-1.2.2-mapfile.patch88
-rw-r--r--sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch15
-rw-r--r--sys-libs/zlib/zlib-1.2.3.ebuild71
3 files changed, 0 insertions, 174 deletions
diff --git a/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch b/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch
deleted file mode 100644
index 82ad8322081c..000000000000
--- a/sys-libs/zlib/files/zlib-1.2.2-mapfile.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- configure.orig 2003-12-02 12:48:03.882675272 -0800
-+++ configure 2003-12-02 13:00:18.728031272 -0800
-@@ -76,7 +76,9 @@
- 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"};;
-+ Linux | linux | GNU | GNU/*)
-+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
-+ MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};;
- CYGWIN* | Cygwin* | cygwin* | OS/2* )
- EXE='.exe';;
- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
-@@ -123,6 +125,7 @@
- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
- CFLAGS=${CFLAGS-"-fast -xcg89"}
-+ MAPFILE=${MAPFILE-"-M mapfile"}
- LDSHARED=${LDSHARED-"cc -G"};;
- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
- CFLAGS=${CFLAGS-"-O2"}
-@@ -169,6 +172,7 @@
- echo 'No shared library support; try without defining CC and CFLAGS'
- shared=0;
- fi
-+ LDSHARED="${LDSHARED} ${MAPFILE}"
- fi
- if test $shared -eq 0; then
- LDSHARED="$CC"
---- /dev/null 2003-10-15 22:31:52.000000000 -0700
-+++ mapfile 2003-12-02 12:59:22.275926800 -0800
-@@ -0,0 +1,56 @@
-+{
-+ global:
-+ zlibVersion ;
-+ deflateInit_ ;
-+ deflateInit2_ ;
-+ deflate ;
-+ deflateSetDictionary ;
-+ deflateCopy ;
-+ deflateReset ;
-+ deflateParams ;
-+ deflateEnd ;
-+ deflateBound ;
-+ deflatePrime ;
-+ inflateInit_ ;
-+ inflateInit2_ ;
-+ inflate ;
-+ inflateSetDictionary ;
-+ inflateSync ;
-+ inflateReset ;
-+ inflateEnd ;
-+ inflateCopy ;
-+ inflateBackInit_ ;
-+ inflateBack ;
-+ inflateBackEnd ;
-+ zlibCompileFlags ;
-+ compressBound ;
-+ compress ;
-+ compress2 ;
-+ uncompress ;
-+ gzopen ;
-+ gzdopen ;
-+ gzsetparams ;
-+ gzread ;
-+ gzwrite ;
-+ gzprintf ;
-+ gzputs ;
-+ gzgets ;
-+ gzputc ;
-+ gzgetc ;
-+ gzungetc ;
-+ gzflush ;
-+ gzseek ;
-+ gzrewind ;
-+ gztell ;
-+ gzeof ;
-+ gzclose ;
-+ gzerror ;
-+ gzclearerr ;
-+ adler32 ;
-+ crc32 ;
-+ zError ;
-+ inflateSyncPoint ;
-+ get_crc_table ;
-+ local:
-+ *;
-+};
diff --git a/sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch b/sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch
deleted file mode 100644
index 4c98b9814482..000000000000
--- a/sys-libs/zlib/files/zlib-1.2.3-bsd-soname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Generate a DT_SONAME on *BSD machines
-
-http://bugs.gentoo.org/123571
-
---- configure
-+++ configure
-@@ -80,7 +80,7 @@
- SFLAGS="${CFLAGS-"-O3"} -fPIC"
- CFLAGS="$cflags"
- case `(uname -s || echo unknown) 2>/dev/null` in
-- Linux | linux | GNU | GNU/*)
-+ Linux | linux | GNU | GNU/* | *BSD | DragonFly)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"}
- MAPFILE=${MAPFILE-"-Wl,--version-script,mapfile"};;
- CYGWIN* | Cygwin* | cygwin* | OS/2* )
diff --git a/sys-libs/zlib/zlib-1.2.3.ebuild b/sys-libs/zlib/zlib-1.2.3.ebuild
deleted file mode 100644
index f606fd0add07..000000000000
--- a/sys-libs/zlib/zlib-1.2.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.3.ebuild,v 1.11 2006/08/20 21:18:28 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="http://www.zlib.net/"
-SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2
- http://www.zlib.net/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="build"
-
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # Make sure we link with glibc at all times
- epatch "${FILESDIR}"/${PN}-1.2.1-glibc.patch
- # Needed for Alpha and prelink
- epatch "${FILESDIR}"/${PN}-1.2.1-build-fPIC.patch
- # Only export global symbols, bug #32764
- epatch "${FILESDIR}"/${PN}-1.2.2-mapfile.patch
- # The configure script can be kind of dumb #55434
- epatch "${FILESDIR}"/${PN}-1.2.1-configure.patch
- # fix shared library test on -fPIC dependant archs
- epatch "${FILESDIR}"/${PN}-1.2.1-fPIC.patch
- # generate DT_SONAME on BSD hosts #123571
- epatch "${FILESDIR}"/${PN}-1.2.3-bsd-soname.patch
- # respect LDFLAGS #126718
- epatch "${FILESDIR}"/${PN}-1.2.3-LDFLAGS.patch
- sed -i -e '/ldconfig/d' Makefile.in
-}
-
-src_compile() {
- tc-export CC RANLIB
- export AR="$(tc-getAR) rc"
- ./configure --shared --prefix=/usr --libdir=/$(get_libdir) || die
- emake || die
-}
-
-src_install() {
- einstall libdir="${D}"/$(get_libdir) || die
- rm "${D}"/$(get_libdir)/libz.a
- insinto /usr/include
- doins zconf.h zlib.h
-
- if ! use build ; then
- doman zlib.3
- dodoc FAQ README ChangeLog
- docinto txt
- dodoc algorithm.txt
- fi
-
- # we don't need the static lib in /lib
- # as it's only for compiling against
- dolib libz.a
-
- # all the shared libs go into /lib
- # for NFS based /usr
- into /
- dolib libz.so.${PV}
- ( cd "${D}"/$(get_libdir) ; chmod 755 libz.so.* )
- dosym libz.so.${PV} /$(get_libdir)/libz.so
- dosym libz.so.${PV} /$(get_libdir)/libz.so.1
- gen_usr_ldscript libz.so
-}