diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2012-02-26 04:05:32 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2012-02-26 04:05:32 +0000 |
| commit | 41d4d864668151fa827a42ec8ec1669859b1f34b (patch) | |
| tree | 39017fcb3c5a428f57e0eaffdb991982284b9638 | |
| parent | Set EAPI=4. (diff) | |
| download | gentoo-2-41d4d864668151fa827a42ec8ec1669859b1f34b.tar.gz gentoo-2-41d4d864668151fa827a42ec8ec1669859b1f34b.tar.bz2 gentoo-2-41d4d864668151fa827a42ec8ec1669859b1f34b.zip | |
Fix bug #403945 and #398675
(Portage version: 2.1.10.49/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/jemalloc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch | 12 | ||||
| -rw-r--r-- | dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild (renamed from dev-libs/jemalloc/jemalloc-2.2.3.ebuild) | 17 |
3 files changed, 32 insertions, 5 deletions
diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog index 271537f69cb0..92846c460d3b 100644 --- a/dev-libs/jemalloc/ChangeLog +++ b/dev-libs/jemalloc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/jemalloc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.9 2012/01/16 11:56:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.10 2012/02/26 04:05:32 anarchy Exp $ + +*jemalloc-2.2.5-r1 (26 Feb 2012) + + 26 Feb 2012; Jory A. Pratt <anarchy@gentoo.org> -jemalloc-2.2.3.ebuild, + +jemalloc-2.2.5-r1.ebuild, +files/jemalloc-2.2.5_fix_html_install.patch: + Fix bug #403945 and #398675 16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> jemalloc-2.2.5.ebuild: Stable for amd64, wrt bug #398521 diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch new file mode 100644 index 000000000000..aff4add8b3fe --- /dev/null +++ b/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch @@ -0,0 +1,12 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -176,7 +176,7 @@ + install -m 644 $$d $(MANDIR)/man3; \ + done + +-install_doc: install_html install_man ++install_doc: install_man + + install: install_bin install_include install_lib install_doc + + diff --git a/dev-libs/jemalloc/jemalloc-2.2.3.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild index 61c157f43067..73a45e2e693c 100644 --- a/dev-libs/jemalloc/jemalloc-2.2.3.ebuild +++ b/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.3.ebuild,v 1.2 2011/11/09 19:53:21 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.5-r1.ebuild,v 1.1 2012/02/26 04:05:32 anarchy Exp $ EAPI=4 @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug stats" +IUSE="debug static-libs stats" DEPEND="" RDEPEND="" @@ -22,7 +22,8 @@ RDEPEND="" src_prepare() { epatch \ "${FILESDIR}/${PN}-strip-optimization.patch" \ - "${FILESDIR}/${PN}-2.2.1-no-pprof.patch" + "${FILESDIR}/${PN}-2.2.1-no-pprof.patch" \ + "${FILESDIR}/${PN}-2.2.5_fix_html_install.patch" \ eautoreconf } @@ -33,3 +34,11 @@ src_configure() { $(use_enable debug) \ $(use_enable stats) } + +src_install() { + emake DESTDIR="${ED}" install || die + dodoc ChangeLog README + dohtml doc/jemalloc.html + + use static-libs || find "${ED}" -name '*.a' -exec rm -f {} + +} |