diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-04-02 21:49:48 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-04-02 21:49:48 +0000 |
| commit | 4ca169b0e90f8ae9d8743241bd74ae98c6229c6c (patch) | |
| tree | 13a0763fea6c51c958cafacedd21dbff478f6767 /dev-libs/libtar | |
| parent | Don't call deprecated python_version() (bug #312291). (diff) | |
| download | gentoo-2-4ca169b0e90f8ae9d8743241bd74ae98c6229c6c.tar.gz gentoo-2-4ca169b0e90f8ae9d8743241bd74ae98c6229c6c.tar.bz2 gentoo-2-4ca169b0e90f8ae9d8743241bd74ae98c6229c6c.zip | |
Don't prestrip and include stdlib.h for free().
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libtar')
| -rw-r--r-- | dev-libs/libtar/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libtar/files/libtar-1.2.11-free.patch | 22 | ||||
| -rw-r--r-- | dev-libs/libtar/libtar-1.2.11-r3.ebuild | 14 |
3 files changed, 39 insertions, 3 deletions
diff --git a/dev-libs/libtar/ChangeLog b/dev-libs/libtar/ChangeLog index c1da9e88c5cc..f36ac3c9d381 100644 --- a/dev-libs/libtar/ChangeLog +++ b/dev-libs/libtar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libtar # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.9 2010/04/02 21:13:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.10 2010/04/02 21:49:48 ssuominen Exp $ + + 02 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> + libtar-1.2.11-r3.ebuild, +files/libtar-1.2.11-free.patch: + Don't prestrip and include stdlib.h for free(). *libtar-1.2.11-r3 (02 Apr 2010) diff --git a/dev-libs/libtar/files/libtar-1.2.11-free.patch b/dev-libs/libtar/files/libtar-1.2.11-free.patch new file mode 100644 index 000000000000..3a7b028d5d2d --- /dev/null +++ b/dev-libs/libtar/files/libtar-1.2.11-free.patch @@ -0,0 +1,22 @@ +stdlib.h is required for free() + +--- lib/output.c ++++ lib/output.c +@@ -20,6 +20,7 @@ + #include <sys/param.h> + + #ifdef STDC_HEADERS ++# include <stdlib.h> + # include <string.h> + #endif + +--- lib/wrapper.c ++++ lib/wrapper.c +@@ -18,6 +18,7 @@ + #include <errno.h> + + #ifdef STDC_HEADERS ++# include <stdlib.h> + # include <string.h> + #endif + diff --git a/dev-libs/libtar/libtar-1.2.11-r3.ebuild b/dev-libs/libtar/libtar-1.2.11-r3.ebuild index 1abfbcc903f5..86de8b6c9cdb 100644 --- a/dev-libs/libtar/libtar-1.2.11-r3.ebuild +++ b/dev-libs/libtar/libtar-1.2.11-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r3.ebuild,v 1.1 2010/04/02 21:13:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r3.ebuild,v 1.2 2010/04/02 21:49:48 ssuominen Exp $ EAPI=2 inherit autotools eutils multilib @@ -21,11 +21,18 @@ DEPEND="zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip )" src_prepare() { - epatch "${WORKDIR}"/${PN}_${PV}-${p_level}.diff + epatch "${WORKDIR}"/${PN}_${PV}-${p_level}.diff \ + "${FILESDIR}"/${P}-free.patch + + sed -i \ + -e '/INSTALL_PROGRAM/s:-s::' \ + {doc,lib{,tar}}/Makefile.in || die + eautoreconf } src_configure() { + export ac_cv_prog_ac_ct_STRIP=true econf \ $(use_enable static-libs static) \ $(use_with zlib) @@ -35,6 +42,9 @@ src_install() { emake DESTDIR="${D}" install || die dodoc ChangeLog* README TODO + newdoc compat/README README.compat + newdoc compat/TODO TODO.compat + newdoc listhash/TODO TODO.listhash newdoc debian/changelog ChangeLog.debian rm -f "${D}"/usr/$(get_libdir)/${PN}.la |