Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
Date: Sun, 26 Feb 2012 03:55:55
Message-Id: 1330228493.202041de560bb29c0178056c0a3b336fda6b8457.anarchy@gentoo
1 commit: 202041de560bb29c0178056c0a3b336fda6b8457
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 03:54:53 2012 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 03:54:53 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=202041de
7
8 Fix bug #398675,403945
9
10 ---
11 dev-libs/jemalloc/Manifest | 3 ++-
12 .../files/jemalloc-2.2.5_fix_html_install.patch | 12 ++++++++++++
13 dev-libs/jemalloc/jemalloc-2.2.5.ebuild | 15 ++++++++++++---
14 3 files changed, 26 insertions(+), 4 deletions(-)
15
16 diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
17 index d7785f4..bb5ea48 100644
18 --- a/dev-libs/jemalloc/Manifest
19 +++ b/dev-libs/jemalloc/Manifest
20 @@ -1,4 +1,5 @@
21 AUX jemalloc-2.2.1-no-pprof.patch 702 RMD160 92b697551e7b24cd7f4974b0ab037952b3b0c2ff SHA1 d9c05608769393ad4999cc3e5910a54b3bd7e5ee SHA256 8e5a36505a90eab85bf746d4eb5a27d473ce25396104a0dd01d25368dd0c099d
22 +AUX jemalloc-2.2.5_fix_html_install.patch 235 RMD160 28cc185627474c3241aff26c9ee66fce2f8435ab SHA1 28323142fa944e73dbe9a36801162a05d25def90 SHA256 900a9c546d56b9a52b4dae9678f62a621c1053357972ce986281da3f44b36d18
23 AUX jemalloc-strip-optimization.patch 800 RMD160 a55b49895ceb9cc48f6fe12215b45f5a8c2e7b15 SHA1 ec662a39f02c5f42344ba987e881828c0df0c580 SHA256 a14ee193968e87d0d87a8146050dcad5a33042af119070dbfbac7d4eba9923ce
24 DIST jemalloc-2.2.5.tar.bz2 224118 RMD160 355d11645d3b4f1a8a82c5455ebf544eab2a2d4e SHA1 0964af950f3e423eec2d04cc1a839149f807dcc9 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f2868e435447f2d41ac42c0b3521e
25 -EBUILD jemalloc-2.2.5.ebuild 777 RMD160 96757a5e897a72d6498c1a27b728a41dfd5955f7 SHA1 a474cf6a9137472eea4b6393ff4e9fa8ce8d7091 SHA256 6c0e971028b90a6d4d8a04bb6ba9b9168e09d05afa711b96124314c3c291f726
26 +EBUILD jemalloc-2.2.5.ebuild 909 RMD160 d9dba869c0e8474b53e1bcbf169a4e1af7ba7808 SHA1 03477a80152bbd8a17fff2e0c8771ca20c886e2b SHA256 3c177c1167011b707b4213087815351f5f475de1e2e6c7352cc801f1769e28cd
27
28 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
29 new file mode 100644
30 index 0000000..aff4add
31 --- /dev/null
32 +++ b/dev-libs/jemalloc/files/jemalloc-2.2.5_fix_html_install.patch
33 @@ -0,0 +1,12 @@
34 +--- a/Makefile.in
35 ++++ b/Makefile.in
36 +@@ -176,7 +176,7 @@
37 + install -m 644 $$d $(MANDIR)/man3; \
38 + done
39 +
40 +-install_doc: install_html install_man
41 ++install_doc: install_man
42 +
43 + install: install_bin install_include install_lib install_doc
44 +
45 +
46
47 diff --git a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
48 index 61c157f..f2629ee 100644
49 --- a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
50 +++ b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2011 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.3.ebuild,v 1.2 2011/11/09 19:53:21 xarthisius Exp $
55 +# $Header: $
56
57 EAPI=4
58
59 @@ -14,7 +14,7 @@ LICENSE="BSD"
60 SLOT="0"
61 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
62
63 -IUSE="debug stats"
64 +IUSE="debug static-libs stats"
65
66 DEPEND=""
67 RDEPEND=""
68 @@ -22,7 +22,8 @@ RDEPEND=""
69 src_prepare() {
70 epatch \
71 "${FILESDIR}/${PN}-strip-optimization.patch" \
72 - "${FILESDIR}/${PN}-2.2.1-no-pprof.patch"
73 + "${FILESDIR}/${PN}-2.2.1-no-pprof.patch" \
74 + "${FILESDIR}/${PN}-2.2.5_fix_html_install.patch" \
75
76 eautoreconf
77 }
78 @@ -33,3 +34,11 @@ src_configure() {
79 $(use_enable debug) \
80 $(use_enable stats)
81 }
82 +
83 +src_install() {
84 + emake DESTDIR="${ED}" install || die
85 + dodoc ChangeLog README
86 + dohtml doc/jemalloc.html
87 +
88 + use static-libs || find "${ED}" -name '*.a' -exec rm -f {} +
89 +}