public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2011-11-20 19:23 Jory Pratt
  0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2011-11-20 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     0da6591fc5d890ca89cbb1669535528c65277a2a
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 19:22:53 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 19:22:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=0da6591f

add new jemalloc for testing

---
 dev-libs/jemalloc/Manifest                         |    4 ++
 .../jemalloc/files/jemalloc-2.2.1-no-pprof.patch   |   24 +++++++++++++
 .../files/jemalloc-strip-optimization.patch        |   25 ++++++++++++++
 dev-libs/jemalloc/jemalloc-2.2.5.ebuild            |   35 ++++++++++++++++++++
 4 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
new file mode 100644
index 0000000..d7785f4
--- /dev/null
+++ b/dev-libs/jemalloc/Manifest
@@ -0,0 +1,4 @@
+AUX jemalloc-2.2.1-no-pprof.patch 702 RMD160 92b697551e7b24cd7f4974b0ab037952b3b0c2ff SHA1 d9c05608769393ad4999cc3e5910a54b3bd7e5ee SHA256 8e5a36505a90eab85bf746d4eb5a27d473ce25396104a0dd01d25368dd0c099d
+AUX jemalloc-strip-optimization.patch 800 RMD160 a55b49895ceb9cc48f6fe12215b45f5a8c2e7b15 SHA1 ec662a39f02c5f42344ba987e881828c0df0c580 SHA256 a14ee193968e87d0d87a8146050dcad5a33042af119070dbfbac7d4eba9923ce
+DIST jemalloc-2.2.5.tar.bz2 224118 RMD160 355d11645d3b4f1a8a82c5455ebf544eab2a2d4e SHA1 0964af950f3e423eec2d04cc1a839149f807dcc9 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f2868e435447f2d41ac42c0b3521e
+EBUILD jemalloc-2.2.5.ebuild 777 RMD160 96757a5e897a72d6498c1a27b728a41dfd5955f7 SHA1 a474cf6a9137472eea4b6393ff4e9fa8ce8d7091 SHA256 6c0e971028b90a6d4d8a04bb6ba9b9168e09d05afa711b96124314c3c291f726

diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
new file mode 100644
index 0000000..e10aab4
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
@@ -0,0 +1,24 @@
+--- a/Makefile.in	2011-04-11 10:42:32.084403330 -0500
++++ b/Makefile.in	2011-04-11 10:43:23.490760665 -0500
+@@ -42,7 +42,6 @@
+ endif
+ 
+ # Lists of files.
+-BINS := @srcroot@bin/pprof
+ CHDRS := @objroot@include/jemalloc/jemalloc@install_suffix@.h \
+ 	@objroot@include/jemalloc/jemalloc_defs@install_suffix@.h
+ CSRCS := @srcroot@src/jemalloc.c @srcroot@src/arena.c @srcroot@src/atomic.c \
+@@ -141,13 +140,6 @@
+ 	$(CC) -o $@ $< -L@objroot@lib -ljemalloc@install_suffix@
+ endif
+ 
+-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 $(CHDRS); do \

diff --git a/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch
new file mode 100644
index 0000000..60b7d6c
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-strip-optimization.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac	2010-02-22 12:07:05.000000000 +0100
++++ b/configure.ac	2010-02-22 12:08:29.000000000 +0100
+@@ -296,21 +296,6 @@
+ fi
+ AC_SUBST([enable_debug])
+ 
+-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 "$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])
+-    else
+-      JE_CFLAGS_APPEND([-O])
+-    fi
+-  fi
+-fi
+-
+ dnl Do not enable statistics calculation by default.
+ AC_ARG_ENABLE([stats],
+   [AS_HELP_STRING([--enable-stats], [Enable statistics calculation/reporting])],
+

diff --git a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
new file mode 100644
index 0000000..61c157f
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
@@ -0,0 +1,35 @@
+# 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.2.3.ebuild,v 1.2 2011/11/09 19:53:21 xarthisius Exp $
+
+EAPI=4
+
+inherit autotools
+
+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="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="debug stats"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-strip-optimization.patch" \
+		"${FILESDIR}/${PN}-2.2.1-no-pprof.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-jemalloc-prefix=j \
+		$(use_enable debug) \
+		$(use_enable stats)
+}



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2012-02-26  3:55 Jory Pratt
  0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2012-02-26  3:55 UTC (permalink / raw
  To: gentoo-commits

commit:     202041de560bb29c0178056c0a3b336fda6b8457
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 03:54:53 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 03:54:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=202041de

Fix bug #398675,403945

---
 dev-libs/jemalloc/Manifest                         |    3 ++-
 .../files/jemalloc-2.2.5_fix_html_install.patch    |   12 ++++++++++++
 dev-libs/jemalloc/jemalloc-2.2.5.ebuild            |   15 ++++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index d7785f4..bb5ea48 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,4 +1,5 @@
 AUX jemalloc-2.2.1-no-pprof.patch 702 RMD160 92b697551e7b24cd7f4974b0ab037952b3b0c2ff SHA1 d9c05608769393ad4999cc3e5910a54b3bd7e5ee SHA256 8e5a36505a90eab85bf746d4eb5a27d473ce25396104a0dd01d25368dd0c099d
+AUX jemalloc-2.2.5_fix_html_install.patch 235 RMD160 28cc185627474c3241aff26c9ee66fce2f8435ab SHA1 28323142fa944e73dbe9a36801162a05d25def90 SHA256 900a9c546d56b9a52b4dae9678f62a621c1053357972ce986281da3f44b36d18
 AUX jemalloc-strip-optimization.patch 800 RMD160 a55b49895ceb9cc48f6fe12215b45f5a8c2e7b15 SHA1 ec662a39f02c5f42344ba987e881828c0df0c580 SHA256 a14ee193968e87d0d87a8146050dcad5a33042af119070dbfbac7d4eba9923ce
 DIST jemalloc-2.2.5.tar.bz2 224118 RMD160 355d11645d3b4f1a8a82c5455ebf544eab2a2d4e SHA1 0964af950f3e423eec2d04cc1a839149f807dcc9 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f2868e435447f2d41ac42c0b3521e
-EBUILD jemalloc-2.2.5.ebuild 777 RMD160 96757a5e897a72d6498c1a27b728a41dfd5955f7 SHA1 a474cf6a9137472eea4b6393ff4e9fa8ce8d7091 SHA256 6c0e971028b90a6d4d8a04bb6ba9b9168e09d05afa711b96124314c3c291f726
+EBUILD jemalloc-2.2.5.ebuild 909 RMD160 d9dba869c0e8474b53e1bcbf169a4e1af7ba7808 SHA1 03477a80152bbd8a17fff2e0c8771ca20c886e2b SHA256 3c177c1167011b707b4213087815351f5f475de1e2e6c7352cc801f1769e28cd

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 0000000..aff4add
--- /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.5.ebuild b/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
index 61c157f..f2629ee 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.5.ebuild
+++ b/dev-libs/jemalloc/jemalloc-2.2.5.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.2.3.ebuild,v 1.2 2011/11/09 19:53:21 xarthisius Exp $
+# $Header: $
 
 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 {} +
+}



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2013-08-11 14:46 Jory Pratt
  0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2013-08-11 14:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4a741333ae8edd49cc39a34a6a3c12ff696b359c
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 14:45:29 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 14:45:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=4a741333

Fix ar call directly, bug #445988, Thanks iamnr3 for patch

---
 dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch | 59 ++++++++++++++++++++++
 dev-libs/jemalloc/jemalloc-3.3.1.ebuild            |  3 +-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
new file mode 100644
index 0000000..6d81cda
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
@@ -0,0 +1,59 @@
+diff --git a/Makefile.in b/Makefile.in
+index 7481047..478becb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,6 +55,8 @@ PIC_CFLAGS = @PIC_CFLAGS@
+ CTARGET = @CTARGET@
+ LDTARGET = @LDTARGET@
+ MKLIB = @MKLIB@
++AR = @AR@
++ARFLAGS = crus
+ CC_MM = @CC_MM@
+ 
+ ifeq (macho, $(ABI))
+@@ -185,7 +187,7 @@ $(objroot)lib/$(LIBJEMALLOC)_s.$(A) : $(COBJS)
+ 
+ $(STATIC_LIBS):
+ 	@mkdir -p $(@D)
+-	$(MKLIB) $+
++	$(AR) $(ARFLAGS) $@ $+
+ 
+ $(objroot)test/bitmap$(EXE): $(objroot)src/bitmap.$(O)
+ 
+diff --git a/configure.ac b/configure.ac
+index c270662..f4b4c21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -226,9 +226,13 @@ PIC_CFLAGS='-fPIC -DPIC'
+ CTARGET='-o $@'
+ LDTARGET='-o $@'
+ EXTRA_LDFLAGS=
+-MKLIB='ar crus $@'
+ CC_MM=1
+ 
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
++
+ dnl Platform-specific settings.  abi and RPATH can probably be determined
+ dnl programmatically, but doing so is error-prone, which makes it generally
+ dnl not worth the trouble.
+@@ -310,7 +314,8 @@ case "${host}" in
+ 	  EXTRA_LDFLAGS="-link -DEBUG"
+ 	  CTARGET='-Fo$@'
+ 	  LDTARGET='-Fe$@'
+-	  MKLIB='lib -nologo -out:$@'
++	  AR='lib'
++	  ARFLAGS='-nologo -out:'
+ 	  CC_MM=
+         else
+ 	  importlib="${so}"
+@@ -403,7 +408,6 @@ AC_SUBST([enable_autogen])
+ 
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+-AC_PATH_PROG([AR], [ar], [false], [$PATH])
+ AC_PATH_PROG([LD], [ld], [false], [$PATH])
+ AC_PATH_PROG([AUTOCONF], [autoconf], [false], [$PATH])
+ 

diff --git a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
index afe943a..5874024 100644
--- a/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.3.1.ebuild
@@ -19,7 +19,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-3.0.0-strip-optimization.patch" \
 		"${FILESDIR}/${PN}-3.0.0-no-pprof.patch" \
-		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch"
+		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch" \
+		"${FILESDIR}/${PN}-fix-ar-call.patch"
 
 	eautoreconf
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2014-03-08  0:37 Jory Pratt
  0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2014-03-08  0:37 UTC (permalink / raw
  To: gentoo-commits

commit:     b03081667aa4dfb48de31c89c0a78e8fe2903435
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  8 00:36:30 2014 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 00:36:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=b0308166

Update jemalloc-3.5.1 misc bug fixes

---
 dev-libs/jemalloc/Manifest                         |  2 +-
 .../jemalloc/files/jemalloc-3.0.0-no-pprof.patch   | 27 ----------
 .../jemalloc/files/jemalloc-3.5.1-no-pprof.patch   | 25 +++++++++
 ...tch => jemalloc-3.5.1-strip-optimization.patch} | 14 +++--
 ...patch => jemalloc-3.5.1_fix_html_install.patch} | 10 ++--
 dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch | 59 ----------------------
 ...jemalloc-3.4.0.ebuild => jemalloc-3.5.1.ebuild} |  7 ++-
 7 files changed, 39 insertions(+), 105 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index e8395cd..8e7db71 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1 +1 @@
-DIST jemalloc-3.4.0.tar.bz2 253698 SHA256 f60802c4c2c60bc24598fd052494aea96f4426f3d4decd832eadeed520ff81c0 SHA512 8727e13d5e1d677eeaaba50a33ad8eb3dca09f4e90639cf2957d6be0728fd962f10184e91f404b8c9985e680128a838375b122451601271653c8c6d6386a252b WHIRLPOOL 885ebf9a268a6376bcf20a1ca7ce942b015ef8da468f385cedd6e14da1a8d5d76b1f56be45183ef6c9f86f0d9f17904b093a927a309f0f842483cea02ebfac50
+DIST jemalloc-3.5.1.tar.bz2 336555 SHA256 1a09f2570167ebc5fba4ddcc09176575d8acbb77017faf27797b9ab7f38f349f SHA512 6c7f7a9a5b14743737c87af0a958185387648da5cde1be92983630673ec5673b7ed25ad97cd01be8ec2c7f58209df577a955f58dba40d489699a837f96362d2c WHIRLPOOL 647cf69a7185eaed9d22943e3e0388653570266973fecb56c582cafbe570501785c8f1831a899345b45c2dbb86c5a17f514b7e44dde6edc2047d7a1caed6a8e2

diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch
deleted file mode 100644
index c2fa815..0000000
--- a/dev-libs/jemalloc/files/jemalloc-3.0.0-no-pprof.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6675b59..ce0782f 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -69,7 +69,6 @@ endif
- LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
- 
- # Lists of files.
--BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
- CHDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h \
- 	$(objroot)include/jemalloc/jemalloc_defs$(install_suffix).h
- CSRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c $(srcroot)src/atomic.c \
-@@ -196,13 +195,6 @@ build_lib_shared: $(DSOS)
- build_lib_static: $(STATIC_LIBS)
- build: 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 $(CHDRS); do \
-

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 0000000..30cbd50
--- /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.0.0-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
similarity index 67%
rename from dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
rename to dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
index 98c09af..cc8736b 100644
--- a/dev-libs/jemalloc/files/jemalloc-3.0.0-strip-optimization.patch
+++ b/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
@@ -1,16 +1,15 @@
-diff --git a/configure.ac b/configure.ac
-index a72019e..e366e1c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -556,23 +556,6 @@ if test "x$enable_debug" = "x1" ; then
+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
- AC_SUBST([enable_debug])
  
 -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 "$EXTRA_CFLAGS" | grep "\-O" >/dev/null || optimize="yes"
+-  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])
@@ -26,4 +25,3 @@ index a72019e..e366e1c 100644
  dnl Enable statistics calculation by default.
  AC_ARG_ENABLE([stats],
    [AS_HELP_STRING([--disable-stats],
-

diff --git a/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
similarity index 53%
rename from dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch
rename to dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
index 0f3026d..1ce5ad2 100644
--- a/dev-libs/jemalloc/files/jemalloc-3.0.0_fix_html_install.patch
+++ b/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
@@ -1,8 +1,7 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6675b59..3032c6d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -240,7 +240,7 @@ install_doc_man:
+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
  
@@ -11,4 +10,3 @@ index 6675b59..3032c6d 100644
  
  install: install_bin install_include install_lib install_doc
  
-

diff --git a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch b/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
deleted file mode 100644
index 6d81cda..0000000
--- a/dev-libs/jemalloc/files/jemalloc-fix-ar-call.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 7481047..478becb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -55,6 +55,8 @@ PIC_CFLAGS = @PIC_CFLAGS@
- CTARGET = @CTARGET@
- LDTARGET = @LDTARGET@
- MKLIB = @MKLIB@
-+AR = @AR@
-+ARFLAGS = crus
- CC_MM = @CC_MM@
- 
- ifeq (macho, $(ABI))
-@@ -185,7 +187,7 @@ $(objroot)lib/$(LIBJEMALLOC)_s.$(A) : $(COBJS)
- 
- $(STATIC_LIBS):
- 	@mkdir -p $(@D)
--	$(MKLIB) $+
-+	$(AR) $(ARFLAGS) $@ $+
- 
- $(objroot)test/bitmap$(EXE): $(objroot)src/bitmap.$(O)
- 
-diff --git a/configure.ac b/configure.ac
-index c270662..f4b4c21 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -226,9 +226,13 @@ PIC_CFLAGS='-fPIC -DPIC'
- CTARGET='-o $@'
- LDTARGET='-o $@'
- EXTRA_LDFLAGS=
--MKLIB='ar crus $@'
- CC_MM=1
- 
-+AN_MAKEVAR([AR], [AC_PROG_AR])
-+AN_PROGRAM([ar], [AC_PROG_AR])
-+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
-+AC_PROG_AR
-+
- dnl Platform-specific settings.  abi and RPATH can probably be determined
- dnl programmatically, but doing so is error-prone, which makes it generally
- dnl not worth the trouble.
-@@ -310,7 +314,8 @@ case "${host}" in
- 	  EXTRA_LDFLAGS="-link -DEBUG"
- 	  CTARGET='-Fo$@'
- 	  LDTARGET='-Fe$@'
--	  MKLIB='lib -nologo -out:$@'
-+	  AR='lib'
-+	  ARFLAGS='-nologo -out:'
- 	  CC_MM=
-         else
- 	  importlib="${so}"
-@@ -403,7 +408,6 @@ AC_SUBST([enable_autogen])
- 
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_PATH_PROG([AR], [ar], [false], [$PATH])
- AC_PATH_PROG([LD], [ld], [false], [$PATH])
- AC_PATH_PROG([AUTOCONF], [autoconf], [false], [$PATH])
- 

diff --git a/dev-libs/jemalloc/jemalloc-3.4.0.ebuild b/dev-libs/jemalloc/jemalloc-3.5.1.ebuild
similarity index 83%
rename from dev-libs/jemalloc/jemalloc-3.4.0.ebuild
rename to dev-libs/jemalloc/jemalloc-3.5.1.ebuild
index 68445fa..07e3fcb 100644
--- a/dev-libs/jemalloc/jemalloc-3.4.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-3.5.1.ebuild
@@ -17,10 +17,9 @@ IUSE="debug static-libs stats"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-3.0.0-strip-optimization.patch" \
-		"${FILESDIR}/${PN}-3.0.0-no-pprof.patch" \
-		"${FILESDIR}/${PN}-3.0.0_fix_html_install.patch" \
-		"${FILESDIR}/${PN}-fix-ar-call.patch"
+		"${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
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2016-03-28 14:57 Ian Stakenvicius
  0 siblings, 0 replies; 8+ messages in thread
From: Ian Stakenvicius @ 2016-03-28 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     a9a0530441182f298ed9091d09fe5987d60e8a7e
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 14:56:15 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 14:56:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=a9a05304

version bump to jemalloc-4.1.0

Included upstream commit 33184bf69813087 as requested by rust dev's
to allow system jemalloc to be used with rust/llvm.

 dev-libs/jemalloc/Manifest                         |  2 +-
 .../files/jemalloc-4.1-fix_stack_corruption.patch  | 70 ++++++++++++++++++++++
 ...jemalloc-4.0.4.ebuild => jemalloc-4.1.0.ebuild} | 16 +++--
 3 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 0d48e6d..e9bbcdc 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1 +1 @@
-DIST jemalloc-4.0.4.tar.bz2 391483 SHA256 3fda8d8d7fcd041aa0bebbecd45c46b28873cf37bd36c56bf44961b36d0f42d0 SHA512 93be0551a80d5f5dc3a1044ef3d5f06c5ce65f3c1fd753743ee64340b841fc2d7902178774ab71eaa633f68abad44109870eb84159679fdc8ce6d93db3a53112 WHIRLPOOL c8bc1a81555b30ff519fda90bfbcfcdb6c9e370ba7478bca17058e58e08c36d20a1995ab12d5374d4edb9cdd2469748517a6f1795a24667c5f798c4c0c756a9c
+DIST jemalloc-4.1.0.tar.bz2 412900 SHA256 fad06d714f72adb4265783bc169c6d98eeb032d57ba02d87d1dcb4a2d933ec8e SHA512 12433101936a104115d8d93991b4849daf897bd39d6c28b1235215c7abc627163a70d19259fb1f2eeb0cdd66cfe889c2e40eb77dccee6debd73b1a4313d0de73 WHIRLPOOL 0305d1cc715c565749c5e9c2de396d349c0d79513da80b461324c82f880c6a070a932cea19802ac809810fe01690dcb24047914f937ddf167a990cf7b4110f0c

diff --git a/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch b/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
new file mode 100644
index 0000000..f36c188
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-4.1-fix_stack_corruption.patch
@@ -0,0 +1,70 @@
+From 33184bf69813087bf1885b0993685f9d03320c69 Mon Sep 17 00:00:00 2001
+From: Dmitri Smirnov <dmitrism@microsoft.com>
+Date: Mon, 29 Feb 2016 14:30:19 -0800
+Subject: [PATCH] Fix stack corruption and uninitialized var warning
+
+Stack corruption happens in x64 bit
+
+This resolves #347.
+---
+ src/arena.c      |  2 +-
+ test/unit/hash.c | 13 +++++++------
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/arena.c b/src/arena.c
+index 99e20fd..965c0fe 100644
+--- a/src/arena.c
++++ b/src/arena.c
+@@ -2423,7 +2423,7 @@ arena_malloc_large(tsd_t *tsd, arena_t *arena, szind_t binind, bool zero)
+ 	uintptr_t random_offset;
+ 	arena_run_t *run;
+ 	arena_chunk_map_misc_t *miscelm;
+-	UNUSED bool idump;
++	UNUSED bool idump JEMALLOC_CC_SILENCE_INIT(false);
+ 
+ 	/* Large allocation. */
+ 	usize = index2size(binind);
+diff --git a/test/unit/hash.c b/test/unit/hash.c
+index f50ba81..010c9d7 100644
+--- a/test/unit/hash.c
++++ b/test/unit/hash.c
+@@ -64,14 +64,15 @@ static void
+ hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
+ {
+ 	const int hashbytes = hash_variant_bits(variant) / 8;
+-	VARIABLE_ARRAY(uint8_t, hashes, hashbytes * 256);
++	const int hashes_size = hashbytes * 256;
++	VARIABLE_ARRAY(uint8_t, hashes, hashes_size);
+ 	VARIABLE_ARRAY(uint8_t, final, hashbytes);
+ 	unsigned i;
+ 	uint32_t computed, expected;
+ 
+ 	memset(key, 0, KEY_SIZE);
+-	memset(hashes, 0, sizeof(hashes));
+-	memset(final, 0, sizeof(final));
++	memset(hashes, 0, hashes_size);
++	memset(final, 0, hashbytes);
+ 
+ 	/*
+ 	 * Hash keys of the form {0}, {0,1}, {0,1,2}, ..., {0,1,...,255} as the
+@@ -102,17 +103,17 @@ hash_variant_verify_key(hash_variant_t variant, uint8_t *key)
+ 	/* Hash the result array. */
+ 	switch (variant) {
+ 	case hash_variant_x86_32: {
+-		uint32_t out = hash_x86_32(hashes, hashbytes*256, 0);
++		uint32_t out = hash_x86_32(hashes, hashes_size, 0);
+ 		memcpy(final, &out, sizeof(out));
+ 		break;
+ 	} case hash_variant_x86_128: {
+ 		uint64_t out[2];
+-		hash_x86_128(hashes, hashbytes*256, 0, out);
++		hash_x86_128(hashes, hashes_size, 0, out);
+ 		memcpy(final, out, sizeof(out));
+ 		break;
+ 	} case hash_variant_x64_128: {
+ 		uint64_t out[2];
+-		hash_x64_128(hashes, hashbytes*256, 0, out);
++		hash_x64_128(hashes, hashes_size, 0, out);
+ 		memcpy(final, out, sizeof(out));
+ 		break;
+ 	} default: not_reached();

diff --git a/dev-libs/jemalloc/jemalloc-4.0.4.ebuild b/dev-libs/jemalloc/jemalloc-4.1.0.ebuild
similarity index 88%
rename from dev-libs/jemalloc/jemalloc-4.0.4.ebuild
rename to dev-libs/jemalloc/jemalloc-4.1.0.ebuild
index 5cbaa8d..28ecefb 100644
--- a/dev-libs/jemalloc/jemalloc-4.0.4.ebuild
+++ b/dev-libs/jemalloc/jemalloc-4.1.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools-multilib eutils
+inherit autotools toolchain-funcs multilib-build
 
 DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
 HOMEPAGE="http://www.canonware.com/jemalloc/"
@@ -17,18 +17,18 @@ IUSE="debug static-libs stats"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-3.5.1-strip-optimization.patch"
 	"${FILESDIR}/${PN}-3.5.1_fix_html_install.patch"
+	"${FILESDIR}/${PN}-4.1-fix_stack_corruption.patch"
 )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
 # autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
 # but jemalloc doesn't implement them in its configure; need this here to
 # supress the warnings until automagic is removed from the eclass
 QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-src_configure() {
-	myeconfargs=(
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable debug)
 		$(use_enable stats)
-	)
-	autotools-multilib_src_configure
 }
 
 multilib_src_install() {
@@ -37,9 +37,7 @@ multilib_src_install() {
 	emake DESTDIR="${D}" install
 }
 
-src_install() {
-	autotools-multilib_src_install
-
+multilib_src_install_all() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fixup install_name, #437362
 		install_name_tool \


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2017-05-29  6:21 Jory Pratt
  0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2017-05-29  6:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4f21dc4d091602bf6f02636814dc87e8a8e2ca6b
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 06:20:57 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon May 29 06:20:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4f21dc4d

dev-libs/jemalloc: Upstream bug fixes, rediff patches to apply cleanly

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/jemalloc/Manifest                         |  2 +-
 .../files/jemalloc-3.5.1-strip-optimization.patch  | 27 -----------------
 .../files/jemalloc-3.5.1_fix_html_install.patch    | 12 --------
 .../files/jemalloc-4.5.0-fix_html_install.patch    | 25 ++++++++++++++++
 .../files/jemalloc-4.5.0-strip-optimization.patch  | 35 ++++++++++++++++++++++
 ...jemalloc-4.4.0.ebuild => jemalloc-4.5.0.ebuild} |  6 ++--
 dev-libs/jemalloc/metadata.xml                     | 17 +++++++++++
 7 files changed, 81 insertions(+), 43 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 6489b88..3e9ded5 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1 +1 @@
-DIST jemalloc-4.4.0.tar.bz2 440144 SHA256 a7aea63e9718d2f1adf81d87e3df3cb1b58deb86fc77bad5d702c4c59687b033 SHA512 2f88fb17ede3bf87e334e9c80949870e0dd85b5adcdd89a1750ccf6df5240f35293159ac0a360d3a29cf0b1d17edf86dcc7997c6bf3190ae7da7442d3a3cc14e WHIRLPOOL 1485ce6cf08ee2233117e281d1a61f376d2b6c73f28c68f2cc1956471bcb56a4eef045c0011de141b669d94d7339de5e79860f6b21bfbeffab821d5eb528759c
+DIST jemalloc-4.5.0.tar.bz2 449992 SHA256 9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780 SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821 WHIRLPOOL 33dc51258d6d27942b656fc355cdde24becf0cd50a507375dd51b2fa6c55a6444ff21bcdae0ebe4fae8d2e95fa31989f5cf8bd435a7a59385ebb225a0a4441fe

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
deleted file mode 100644
index cc8736b..0000000
--- a/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 1ce5ad2..0000000
--- a/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/jemalloc-4.5.0-fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch
new file mode 100644
index 0000000..159702e
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch
@@ -0,0 +1,25 @@
+From c04d0b954adef2d3f1a30d91dc687f6a03b108eb Mon Sep 17 00:00:00 2001
+From: 
+Date: Mon, 29 May 2017 00:58:32 -0500
+Subject: [PATCH 2/2] Do not install html doc
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e49a871..733932a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -381,7 +381,7 @@ install_doc_man:
+ 	$(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
+ 
+-- 
+2.13.0
+

diff --git a/dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch
new file mode 100644
index 0000000..8b346be
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch
@@ -0,0 +1,35 @@
+From c568271163445e380679788388f1cb1edbdeaf88 Mon Sep 17 00:00:00 2001
+From: 
+Date: Mon, 29 May 2017 00:57:15 -0500
+Subject: [PATCH 1/2] Strip all optimization, let portage handle.
+
+---
+ configure.ac | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 20a8a64..d8af618 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -851,18 +851,6 @@ if test "x$enable_ivsalloc" = "x1" ; then
+   AC_DEFINE([JEMALLOC_IVSALLOC], [ ])
+ fi
+ 
+-dnl Only optimize if not debugging.
+-if test "x$enable_debug" = "x0" ; then
+-  if test "x$GCC" = "xyes" ; then
+-    JE_CFLAGS_ADD([-O3])
+-    JE_CFLAGS_ADD([-funroll-loops])
+-  elif test "x$je_cv_msvc" = "xyes" ; then
+-    JE_CFLAGS_ADD([-O2])
+-  else
+-    JE_CFLAGS_ADD([-O])
+-  fi
+-fi
+-
+ dnl Enable statistics calculation by default.
+ AC_ARG_ENABLE([stats],
+   [AS_HELP_STRING([--disable-stats],
+-- 
+2.13.0
+

diff --git a/dev-libs/jemalloc/jemalloc-4.4.0.ebuild b/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
similarity index 91%
rename from dev-libs/jemalloc/jemalloc-4.4.0.ebuild
rename to dev-libs/jemalloc/jemalloc-4.5.0.ebuild
index d34d914..9f7906e 100644
--- a/dev-libs/jemalloc/jemalloc-4.4.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,8 +14,8 @@ SLOT="0/2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="debug hardened static-libs stats"
 HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-3.5.1-strip-optimization.patch"
-	"${FILESDIR}/${PN}-3.5.1_fix_html_install.patch"
+PATCHES=( "${FILESDIR}/${PN}-4.5.0-strip-optimization.patch"
+	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
 )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
 # autotools-utils.eclass auto-adds configure options when static-libs is in IUSE

diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
new file mode 100644
index 0000000..d376e50
--- /dev/null
+++ b/dev-libs/jemalloc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
+	<longdescription lang="en">
+		Jemalloc is a general-purpose scalable concurrent allocator
+	</longdescription>
+	<use>
+		<flag name="stats">Enable statistics calculation/reporting</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jemalloc/jemalloc</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2017-10-08 13:54 Jory Pratt
  0 siblings, 0 replies; 8+ messages in thread
From: Jory Pratt @ 2017-10-08 13:54 UTC (permalink / raw
  To: gentoo-commits

commit:     a91da9bca9b1b2e4ba81ca4d477e2648a81f6b6a
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 13:54:15 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 13:54:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=a91da9bc

dev-libs/jemalloc - 5.0.1 version bump

 dev-libs/jemalloc/Manifest                         |  1 +
 .../files/jemalloc-5.0.1-fix_html_install.patch    | 26 ++++++++++
 .../files/jemalloc-5.0.1-strip-optimization.patch  | 39 ++++++++++++++
 dev-libs/jemalloc/jemalloc-5.0.1.ebuild            | 59 ++++++++++++++++++++++
 4 files changed, 125 insertions(+)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 3e9ded5..90014ea 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1 +1,2 @@
 DIST jemalloc-4.5.0.tar.bz2 449992 SHA256 9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780 SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821 WHIRLPOOL 33dc51258d6d27942b656fc355cdde24becf0cd50a507375dd51b2fa6c55a6444ff21bcdae0ebe4fae8d2e95fa31989f5cf8bd435a7a59385ebb225a0a4441fe
+DIST jemalloc-5.0.1.tar.bz2 499300 SHA256 4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3 WHIRLPOOL 7bbaa407b1e403ef3bb5ecf6289dcf7f3cc9e31d8077d6e9b10e434e8f02e8e8c45ec890b67bcf39f8b7419ffcae893b4aa256f1a05750b196fcfbfadbd8696a

diff --git a/dev-libs/jemalloc/files/jemalloc-5.0.1-fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-5.0.1-fix_html_install.patch
new file mode 100644
index 0000000..e64c5f8
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-5.0.1-fix_html_install.patch
@@ -0,0 +1,26 @@
+From d6518615c0891a1115bf6436f6e6bf28797a32ea Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sun, 8 Oct 2017 08:49:21 -0500
+Subject: [PATCH 2/2] Do not install html docs
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index fec1397..97bad40 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -459,7 +459,7 @@ install_doc_man:
+ 	$(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
+ 
+-- 
+2.14.2
+

diff --git a/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch
new file mode 100644
index 0000000..bdef8a6
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch
@@ -0,0 +1,39 @@
+From bbae65cff977568549efe03f05b2ef16cd283550 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sun, 8 Oct 2017 08:47:25 -0500
+Subject: [PATCH 1/2] Strip all optimization, let portage handle.
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ configure.ac | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1551ded..2f47067 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -976,21 +976,6 @@ if test "x$enable_debug" = "x1" ; then
+ fi
+ AC_SUBST([enable_debug])
+ 
+-dnl Only optimize if not debugging.
+-if test "x$enable_debug" = "x0" ; then
+-  if test "x$GCC" = "xyes" ; then
+-    JE_CFLAGS_ADD([-O3])
+-    JE_CXXFLAGS_ADD([-O3])
+-    JE_CFLAGS_ADD([-funroll-loops])
+-  elif test "x$je_cv_msvc" = "xyes" ; then
+-    JE_CFLAGS_ADD([-O2])
+-    JE_CXXFLAGS_ADD([-O2])
+-  else
+-    JE_CFLAGS_ADD([-O])
+-    JE_CXXFLAGS_ADD([-O])
+-  fi
+-fi
+-
+ dnl Enable statistics calculation by default.
+ AC_ARG_ENABLE([stats],
+   [AS_HELP_STRING([--disable-stats],
+-- 
+2.14.2
+

diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
new file mode 100644
index 0000000..a2253d7
--- /dev/null
+++ b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
+HOMEPAGE="http://www.canonware.com/jemalloc/"
+SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="debug hardened static-libs stats"
+HTML_DOCS=( doc/jemalloc.html )
+PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
+	"${FILESDIR}/${PN}-5.0.1-fix_html_install.patch"
+)
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
+# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
+# but jemalloc doesn't implement them in its configure; need this here to
+# supress the warnings until automagic is removed from the eclass
+QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use hardened ; then
+		myconf+=( --disable-syscall )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf  \
+		$(use_enable debug) \
+		$(use_enable stats) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	# Copy man file which the Makefile looks for
+	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	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
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/
@ 2022-04-12 11:56 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-04-12 11:56 UTC (permalink / raw
  To: gentoo-commits

commit:     cd4ec606973586169d80cc2520d48119969ff750
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 11:35:47 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 11:54:27 2022 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=cd4ec606

dev-libs/jemalloc: remove outdated

 - and most likely security vulnerable versions,
 - ::gentoo is at 5.2.1.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/jemalloc/Manifest                         |  1 -
 .../files/jemalloc-5.2.0-gentoo-fixups.patch       | 54 -------------------
 dev-libs/jemalloc/jemalloc-5.2.0.ebuild            | 60 ----------------------
 dev-libs/jemalloc/metadata.xml                     | 19 -------
 4 files changed, 134 deletions(-)

diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
deleted file mode 100644
index 06a80d25..00000000
--- a/dev-libs/jemalloc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234

diff --git a/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch b/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch
deleted file mode 100644
index 2e7fd0da..00000000
--- a/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 482a28e74f9b3c83bef6499842f1191c04ae80d9 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Tue, 23 Apr 2019 10:04:19 -0500
-Subject: [PATCH] Don't override user cflags, disable html_doc from being
- installed
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- Makefile.in  |  2 +-
- configure.ac | 15 ---------------
- 2 files changed, 1 insertion(+), 16 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 0777f6a..31767b6 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -511,7 +511,7 @@ install_doc_man:
- 	$(INSTALL) -m 644 $$d $(MANDIR)/man3; \
- done
- 
--install_doc: build_doc install_doc_html install_doc_man
-+install_doc: build_doc install_doc_man
- 
- install: install_bin install_include install_lib install_doc
- 
-diff --git a/configure.ac b/configure.ac
-index 96f76d3..f716ebd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1108,21 +1108,6 @@ if test "x$enable_debug" = "x1" ; then
- fi
- AC_SUBST([enable_debug])
- 
--dnl Only optimize if not debugging.
--if test "x$enable_debug" = "x0" ; then
--  if test "x$GCC" = "xyes" ; then
--    JE_CFLAGS_ADD([-O3])
--    JE_CXXFLAGS_ADD([-O3])
--    JE_CFLAGS_ADD([-funroll-loops])
--  elif test "x$je_cv_msvc" = "xyes" ; then
--    JE_CFLAGS_ADD([-O2])
--    JE_CXXFLAGS_ADD([-O2])
--  else
--    JE_CFLAGS_ADD([-O])
--    JE_CXXFLAGS_ADD([-O])
--  fi
--fi
--
- dnl Enable statistics calculation by default.
- AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--disable-stats],
--- 
-2.21.0
-

diff --git a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
deleted file mode 100644
index ecf6d5e1..00000000
--- a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="http://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock static-libs stats xmalloc"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable lazy-lock) \
-		$(use_enable stats) \
-		$(use_enable xmalloc) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}

diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
deleted file mode 100644
index 08893bb6..00000000
--- a/dev-libs/jemalloc/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>mozilla@gentoo.org</email>
-		<name>Gentoo Mozilla Team</name>
-	</maintainer>
-	<longdescription lang="en">
-		Jemalloc is a general-purpose scalable concurrent allocator
-	</longdescription>
-	<use>
-		<flag name="lazy-lock">Enable lazy locking (only lock when multi-threaded)</flag>
-		<flag name="stats">Enable statistics calculation/reporting</flag>
-		<flag name="xmalloc">Add support for xmalloc (abort-on-out-of-memory)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">jemalloc/jemalloc</remote-id>
-	</upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-04-12 11:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-08 13:54 [gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/ Jory Pratt
  -- strict thread matches above, loose matches on Subject: below --
2022-04-12 11:56 Joonas Niilola
2017-05-29  6:21 Jory Pratt
2016-03-28 14:57 Ian Stakenvicius
2014-03-08  0:37 Jory Pratt
2013-08-11 14:46 Jory Pratt
2012-02-26  3:55 Jory Pratt
2011-11-20 19:23 Jory Pratt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox