commit: 69b9621c21834f6259f4a2f3f151be53e5a8360f Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Tue Apr 23 15:18:43 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Tue Apr 23 15:18:43 2019 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=69b9621c
dev-libs/jemalloc: version 5.2.0 bump Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> dev-libs/jemalloc/Manifest | 2 +- .../files/jemalloc-4.5.0-fix_html_install.patch | 25 ---------- .../files/jemalloc-5.0.1-strip-optimization.patch | 26 ----------- .../files/jemalloc-5.2.0-gentoo-fixups.patch | 54 ++++++++++++++++++++++ ...jemalloc-5.1.0.ebuild => jemalloc-5.2.0.ebuild} | 7 ++- dev-libs/jemalloc/metadata.xml | 1 - 6 files changed, 58 insertions(+), 57 deletions(-) diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest index 168443f..06a80d2 100644 --- a/dev-libs/jemalloc/Manifest +++ b/dev-libs/jemalloc/Manifest @@ -1 +1 @@ -DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f +DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234 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 deleted file mode 100644 index 159702e..0000000 --- a/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-5.0.1-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch deleted file mode 100644 index 523badf..0000000 --- a/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1551ded8..2f470672 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], 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 new file mode 100644 index 0000000..2e7fd0d --- /dev/null +++ b/dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch @@ -0,0 +1,54 @@ +From 482a28e74f9b3c83bef6499842f1191c04ae80d9 Mon Sep 17 00:00:00 2001 +From: Jory Pratt <[email protected]> +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 <[email protected]> +--- + 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.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild similarity index 91% rename from dev-libs/jemalloc/jemalloc-5.1.0.ebuild rename to dev-libs/jemalloc/jemalloc-5.2.0.ebuild index 7eda36e..ecf6d5e 100644 --- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild +++ b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,9 +14,8 @@ 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.0.1-strip-optimization.patch" - "${FILESDIR}/${PN}-4.5.0-fix_html_install.patch" -) +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 diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml index 848a0a7..08893bb 100644 --- a/dev-libs/jemalloc/metadata.xml +++ b/dev-libs/jemalloc/metadata.xml @@ -9,7 +9,6 @@ Jemalloc is a general-purpose scalable concurrent allocator </longdescription> <use> - <flag name="hugepages">Enable transparent huge page support</flag> <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>
