diff options
author | Jory A. Pratt <anarchy@gentoo.org> | 2017-05-29 01:20:57 -0500 |
---|---|---|
committer | Jory A. Pratt <anarchy@gentoo.org> | 2017-05-29 01:20:57 -0500 |
commit | 4f21dc4d091602bf6f02636814dc87e8a8e2ca6b (patch) | |
tree | 3c8d4b6c158d80a68636a4133597383e5801e1aa /dev-libs | |
parent | www-client/firefox: Misc upstream bug fixes (diff) | |
download | mozilla-4f21dc4d091602bf6f02636814dc87e8a8e2ca6b.tar.gz mozilla-4f21dc4d091602bf6f02636814dc87e8a8e2ca6b.tar.bz2 mozilla-4f21dc4d091602bf6f02636814dc87e8a8e2ca6b.zip |
dev-libs/jemalloc: Upstream bug fixes, rediff patches to apply cleanly
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/jemalloc/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch | 27 | ||||
-rw-r--r-- | dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch | 12 | ||||
-rw-r--r-- | dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch | 25 | ||||
-rw-r--r-- | dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch | 35 | ||||
-rw-r--r-- | dev-libs/jemalloc/jemalloc-4.5.0.ebuild (renamed from dev-libs/jemalloc/jemalloc-4.4.0.ebuild) | 6 | ||||
-rw-r--r-- | 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 6489b883..3e9ded56 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 cc8736b8..00000000 --- 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 1ce5ad2e..00000000 --- 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 00000000..159702e6 --- /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 00000000..8b346be8 --- /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 index d34d914c..9f7906ea 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 00000000..d376e50e --- /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> |