diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-06-12 01:51:21 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-06-12 01:51:21 +0200 |
| commit | a0fc8ab0ac70a0eb49dd40b2af8eb186fb00204d (patch) | |
| tree | b71a0784d3982c2a5c2fae03637068a0f81950c9 /dev-libs/jemalloc | |
| parent | dev-libs/jemalloc: bump to v5.2.0 (diff) | |
| download | gentoo-a0fc8ab0ac70a0eb49dd40b2af8eb186fb00204d.tar.gz gentoo-a0fc8ab0ac70a0eb49dd40b2af8eb186fb00204d.tar.bz2 gentoo-a0fc8ab0ac70a0eb49dd40b2af8eb186fb00204d.zip | |
dev-libs/jemalloc: use version from mozilla repository
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-libs/jemalloc')
| -rw-r--r-- | dev-libs/jemalloc/files/jemalloc-5.2.0-fix_html_install.patch | 11 | ||||
| -rw-r--r-- | dev-libs/jemalloc/files/jemalloc-5.2.0-gentoo-fixups.patch | 54 | ||||
| -rw-r--r-- | dev-libs/jemalloc/jemalloc-5.2.0.ebuild | 5 |
3 files changed, 56 insertions, 14 deletions
diff --git a/dev-libs/jemalloc/files/jemalloc-5.2.0-fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-5.2.0-fix_html_install.patch deleted file mode 100644 index fe7bcb4a07b2..000000000000 --- a/dev-libs/jemalloc/files/jemalloc-5.2.0-fix_html_install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/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 000000000000..2e7fd0da67b1 --- /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 <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 index d2b63f0d0396..16ced36e7579 100644 --- a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild +++ b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild @@ -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}-5.2.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 |