refactoring and automated testing, includes heap profiling optimizations

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB4D088B4)

5 files changed, 117 insertions, 2 deletions

diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog
index 6a223666b53f..dc1f9bcf1094 100644
--- a/dev-libs/jemalloc/ChangeLog
+++ b/dev-libs/jemalloc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/jemalloc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.35 2013/09/24 22:52:47 anarchy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.36 2014/03/10 14:39:41 anarchy Exp $
+
+*jemalloc-3.5.1 (10 Mar 2014)
+
+  10 Mar 2014;  <anarchy@gentoo.org> +files/jemalloc-3.5.1-no-pprof.patch,
+  +files/jemalloc-3.5.1-strip-optimization.patch,
+  +files/jemalloc-3.5.1_fix_html_install.patch, +jemalloc-3.5.1.ebuild:
+  refactoring and automated testing, includes heap profiling optimizations
 
   24 Sep 2013; Jory A. Pratt <anarchy@gentoo.org>
   +files/jemalloc-fix-ar-call.patch:
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch
new file mode 100644
index 000000000000..30cbd501ec5d
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch
@@ -0,0 +1,25 @@
+diff -urN a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2014-02-25 18:49:15.000000000 -0600
++++ b/Makefile.in	2014-03-07 18:24:10.978141932 -0600
+@@ -73,7 +73,6 @@
+ LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
+ 
+ # Lists of files.
+-BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
+ C_HDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h
+ C_SRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c \
+ 	$(srcroot)src/atomic.c $(srcroot)src/base.c $(srcroot)src/bitmap.c \
+@@ -273,13 +272,6 @@
+ build_lib_static: $(STATIC_LIBS)
+ build_lib: build_lib_shared build_lib_static
+ 
+-install_bin:
+-	install -d $(BINDIR)
+-	@for b in $(BINS); do \
+-	echo "install -m 755 $$b $(BINDIR)"; \
+-	install -m 755 $$b $(BINDIR); \
+-done
+-
+ install_include:
+ 	install -d $(INCLUDEDIR)/jemalloc
+ 	@for h in $(C_HDRS); do \
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
new file mode 100644
index 000000000000..cc8736b84123
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
@@ -0,0 +1,27 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2014-02-25 18:49:15.000000000 -0600
++++ b/configure.ac	2014-03-07 18:19:53.718147847 -0600
+@@ -639,23 +639,6 @@
+   AC_DEFINE([JEMALLOC_IVSALLOC], [ ])
+ fi
+ 
+-dnl Only optimize if not debugging.
+-if test "x$enable_debug" = "x0" -a "x$no_CFLAGS" = "xyes" ; then
+-  dnl Make sure that an optimization flag was not specified in EXTRA_CFLAGS.
+-  optimize="no"
+-  echo "$CFLAGS $EXTRA_CFLAGS" | grep '\-O' >/dev/null || optimize="yes"
+-  if test "x${optimize}" = "xyes" ; then
+-    if test "x$GCC" = "xyes" ; then
+-      JE_CFLAGS_APPEND([-O3])
+-      JE_CFLAGS_APPEND([-funroll-loops])
+-    elif test "x$je_cv_msvc" = "xyes" ; then
+-      JE_CFLAGS_APPEND([-O2])
+-    else
+-      JE_CFLAGS_APPEND([-O])
+-    fi
+-  fi
+-fi
+-
+ dnl Enable statistics calculation by default.
+ AC_ARG_ENABLE([stats],
+   [AS_HELP_STRING([--disable-stats],
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
new file mode 100644
index 000000000000..1ce5ad2ede95
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
@@ -0,0 +1,12 @@
+diff -urN a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2014-02-25 18:49:15.000000000 -0600
++++ b/Makefile.in	2014-03-07 18:26:23.074138895 -0600
+@@ -317,7 +317,7 @@
+ 	install -m 644 $$d $(MANDIR)/man3; \
+ done
+ 
+-install_doc: install_doc_html install_doc_man
++install_doc: install_doc_man
+ 
+ install: install_bin install_include install_lib install_doc
+ 
diff --git a/dev-libs/jemalloc/jemalloc-3.5.1.ebuild b/dev-libs/jemalloc/jemalloc-3.5.1.ebuild
new file mode 100644
index 000000000000..1c7d0b26a255
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-3.5.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-3.5.1.ebuild,v 1.1 2014/03/10 14:39:41 anarchy Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://www.canonware.com/jemalloc/"
+SRC_URI="http://www.canonware.com/download/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x64-macos"
+IUSE="debug static-libs stats"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-3.5.1-strip-optimization.patch" \
+		"${FILESDIR}/${PN}-3.5.1-no-pprof.patch" \
+		"${FILESDIR}/${PN}-3.5.1_fix_html_install.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable stats)
+}
+
+src_install() {
+	default
+	dohtml doc/jemalloc.html
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fixup install_name, #437362
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
+			"${ED}"/usr/$(get_libdir)/libjemalloc.1.dylib || die
+	fi
+	use static-libs || find "${ED}" -name '*.a' -delete
+}