diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2011-01-09 21:25:29 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2011-01-09 21:25:29 +0000 |
| commit | 17567160b85a1318678199f940e3044837e2a5fe (patch) | |
| tree | a4cf94be2d63723b21181aa922cd0a03c3e0993d | |
| parent | Remove old version. (diff) | |
| download | historical-17567160b85a1318678199f940e3044837e2a5fe.tar.gz historical-17567160b85a1318678199f940e3044837e2a5fe.tar.bz2 historical-17567160b85a1318678199f940e3044837e2a5fe.zip | |
Fix file collision with google-perftools bug #351233
Package-Manager: portage-2.1.9.30/cvs/Linux x86_64
| -rw-r--r-- | dev-libs/jemalloc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/jemalloc/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/jemalloc/jemalloc-2.1.0-r1.ebuild (renamed from dev-libs/jemalloc/jemalloc-2.1.0.ebuild) | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog index 8ba020a52a4b..0b6d07910e2f 100644 --- a/dev-libs/jemalloc/ChangeLog +++ b/dev-libs/jemalloc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/jemalloc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.2 2011/01/07 02:14:46 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.3 2011/01/09 21:25:29 anarchy Exp $ + +*jemalloc-2.1.0-r1 (09 Jan 2011) + + 09 Jan 2011; Jory A. Pratt <anarchy@gentoo.org> -jemalloc-2.1.0.ebuild, + +jemalloc-2.1.0-r1.ebuild: + Fix file collision with google-perftools bug #351233 *jemalloc-2.1.0 (07 Jan 2011) diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest index bbb8ac2f8fa0..f4e1ecfec93d 100644 --- a/dev-libs/jemalloc/Manifest +++ b/dev-libs/jemalloc/Manifest @@ -1,5 +1,5 @@ AUX jemalloc-strip-optimization.patch 800 RMD160 a55b49895ceb9cc48f6fe12215b45f5a8c2e7b15 SHA1 ec662a39f02c5f42344ba987e881828c0df0c580 SHA256 a14ee193968e87d0d87a8146050dcad5a33042af119070dbfbac7d4eba9923ce DIST jemalloc-2.1.0.tar.bz2 217758 RMD160 406b31e681bbd71cc8a8b807fbd1202eb3c2e01c SHA1 b4a4d9379875f73a62ae81031b03189d8147d362 SHA256 b0d812686414b41bd39bbd7e894845e66e72ee3fd39f1042959e7bd8f2c19da0 -EBUILD jemalloc-2.1.0.ebuild 823 RMD160 3889da3aee85131c8c8c24bc3de8986ea0e2d2a6 SHA1 d9c311cf789b45d97554e4324fc13a56d59c9fe9 SHA256 38333145a5ed3942a5fb78764824c46206c04e8ffb95eedfd637db6d4530c910 -MISC ChangeLog 545 RMD160 643e6c16797f6cae83000903c1e7e91caa6c8c7b SHA1 2ef7cda1c25177d443f1d0be2cac152c021dc127 SHA256 fdb241158430e718cadd2cdd556173f515fe31219c76cfaff4f71404189ac8d3 +EBUILD jemalloc-2.1.0-r1.ebuild 941 RMD160 0a378aca3383cdd889c516684a8b139167b5379d SHA1 d5b4c0e682ab9e228479c09a1e31ef66db8a6d2d SHA256 d084ff240dddf2216c2024a98fe714d9de499190039eaabdd07e9a13ce66313a +MISC ChangeLog 738 RMD160 8a7cdc36fb0bce0a67e9effdf1153c118aa18ffc SHA1 67f8956b218e1e68c13488e02145d52e97a06b45 SHA256 1861667d47882402938aa698d226833006d8e4f92bd55b2f1fea0bbb09b11860 MISC metadata.xml 414 RMD160 bb98cdf93203dcc175b618895c8662ce1cbba956 SHA1 583105f24aed24787dfce96494205eaf9ebdce66 SHA256 b458048c550c170ab50b25d37198c84130841717989c6ad7d3f95ba6213cfa7e diff --git a/dev-libs/jemalloc/jemalloc-2.1.0.ebuild b/dev-libs/jemalloc/jemalloc-2.1.0-r1.ebuild index febf718eeb87..3ef685c2dad4 100644 --- a/dev-libs/jemalloc/jemalloc-2.1.0.ebuild +++ b/dev-libs/jemalloc/jemalloc-2.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.1.0.ebuild,v 1.1 2011/01/07 02:14:45 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.1.0-r1.ebuild,v 1.1 2011/01/09 21:25:29 anarchy Exp $ EAPI="2" @@ -27,6 +27,7 @@ src_prepare() { src_configure() { econf \ + --with-jemalloc-prefix=j \ $(use_enable debug) \ $(use_enable profile prof) \ $(use_enable stats) \ @@ -35,4 +36,7 @@ src_configure() { src_install() { make DESTDIR="${D}" install + + # Rename pproff to prevent collision + mv "${D}"/usr/bin/pprof "${D}"/usr/bin/jpprof } |