[gentoo-commits] proj/mozilla:master commit in: dev-libs/jemalloc/files/, dev-libs/jemalloc/

["Jory Pratt" <anarchy@gentoo.org>]

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
 }