commit: f7a3f918c785723f4c1b79355d2ff6b58fb79b19 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Wed Dec 14 00:39:03 2016 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Wed Dec 14 00:39:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a3f918
dev-libs/jemalloc - multiple bug fixes and improvements, address missing inhert for multilib bug #602290 dev-libs/jemalloc/Manifest | 4 +- dev-libs/jemalloc/jemalloc-4.0.4.ebuild | 50 ---------------------- dev-libs/jemalloc/jemalloc-4.2.1-r1.ebuild | 49 --------------------- ...jemalloc-4.1.0.ebuild => jemalloc-4.4.0.ebuild} | 21 ++++++--- 4 files changed, 15 insertions(+), 109 deletions(-) diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest index 6bf6de3..f2ade29 100644 --- a/dev-libs/jemalloc/Manifest +++ b/dev-libs/jemalloc/Manifest @@ -1,6 +1,4 @@ DIST jemalloc-2.2.5.tar.bz2 224118 SHA256 efcc9636757bd7f53a0fde084c2988bfe26f2868e435447f2d41ac42c0b3521e SHA512 56a29dc7dca66c41d2934731c4bc756de5b58bf707dc2ebcf8515be400ce25e372af6526035117cad5b1964b9ba040ab7178f4c28c1649e86dcb53c3ec884a9d WHIRLPOOL e88fc56ac9db024483196d62e870fe4981d1d02fbf5e3819da504568cc58c8f246df668bb3dfe70ad2d551671577c18d5e6432e60bb3107296e6faad7cd8595c DIST jemalloc-3.3.1.tar.bz2 252997 SHA256 35c433cc1df5cdf9eb58b7980338552fc1d7aa64f89fe5643a972ccedb7cf20a SHA512 32814e8678af4954e26c0c0a0e5d06aba8f3844205fe212c5e41929dfab6a94ff11127a9238b5c18d72749827c467ecb874b8f3a9bc161cf1afdf4ea84c58690 WHIRLPOOL 35e8948e18ea7111ae830a8245be995b35f44ed2c2f687f706ee6941c78350c2cfaabefba223c4433069de47a9f92d621feaf176ec0c728e513e5f076e5fc874 DIST jemalloc-3.6.0.tar.bz2 338964 SHA256 e16c2159dd3c81ca2dc3b5c9ef0d43e1f2f45b04548f42db12e7c12d7bdf84fe SHA512 ebe7c64558a87a735b5906d5cb7527c241664eeae7328538675a12eabe7a1004be0f8766a3bd2a78e61334b196ca7ffc0ee8b8ff59167922a35f126cd1e76e43 WHIRLPOOL d5452005951b10d9d529349481779d79361ec8d8ac1f36f4b54408b5e0184f35d79fee8378188d98f1b8e41ae13557a2cf41ab849b68856ba69f33870fe6e980 -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 -DIST jemalloc-4.2.1.tar.bz2 431132 SHA256 5630650d5c1caab95d2f0898de4fe5ab8519dc680b04963b38bb425ef6a42d57 SHA512 a0bbf2150371bf31b386c668bc636a56e82145a8a81586d0898cdeed707bf1b694e777ea2afba521584998a60663bb4734e8a83697a337ea13e6ade4de737c18 WHIRLPOOL 2fd0dd55184eef49329dfff40ef1fc4bce8304e52f0fd0e11fa6bd380a93206d600d8ff3bb1ac442fcab7ecdda2a1ac56cb68f30bb70bc1ced0f54e835ca9bef +DIST jemalloc-4.4.0.tar.bz2 440144 SHA256 a7aea63e9718d2f1adf81d87e3df3cb1b58deb86fc77bad5d702c4c59687b033 SHA512 2f88fb17ede3bf87e334e9c80949870e0dd85b5adcdd89a1750ccf6df5240f35293159ac0a360d3a29cf0b1d17edf86dcc7997c6bf3190ae7da7442d3a3cc14e WHIRLPOOL 1485ce6cf08ee2233117e281d1a61f376d2b6c73f28c68f2cc1956471bcb56a4eef045c0011de141b669d94d7339de5e79860f6b21bfbeffab821d5eb528759c diff --git a/dev-libs/jemalloc/jemalloc-4.0.4.ebuild b/dev-libs/jemalloc/jemalloc-4.0.4.ebuild deleted file mode 100644 index 5cbaa8d..00000000 --- a/dev-libs/jemalloc/jemalloc-4.0.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-multilib eutils - -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/2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~x64-macos" -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" -) -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=( - $(use_enable debug) - $(use_enable stats) - ) - autotools-multilib_src_configure -} - -multilib_src_install() { - # Copy man file which the Makefile looks for - cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die - emake DESTDIR="${D}" install -} - -src_install() { - autotools-multilib_src_install - - 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 -} diff --git a/dev-libs/jemalloc/jemalloc-4.2.1-r1.ebuild b/dev-libs/jemalloc/jemalloc-4.2.1-r1.ebuild deleted file mode 100644 index c7f3d8a..00000000 --- a/dev-libs/jemalloc/jemalloc-4.2.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit toolchain-funcs multilib-build - -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/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos" -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.2-issue_399.patch" - "${FILESDIR}/${PN}-4.2-issue_443.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" - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) - $(use_enable stats) -} - -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 -} diff --git a/dev-libs/jemalloc/jemalloc-4.1.0.ebuild b/dev-libs/jemalloc/jemalloc-4.4.0.ebuild similarity index 79% rename from dev-libs/jemalloc/jemalloc-4.1.0.ebuild rename to dev-libs/jemalloc/jemalloc-4.4.0.ebuild index a03d99d..b5f2806 100644 --- a/dev-libs/jemalloc/jemalloc-4.1.0.ebuild +++ b/dev-libs/jemalloc/jemalloc-4.4.0.ebuild @@ -4,20 +4,19 @@ EAPI=6 -inherit toolchain-funcs multilib-build +inherit toolchain-funcs multilib-build multilib-minimal 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"; +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 static-libs stats" +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" - "${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 @@ -26,9 +25,17 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h ) QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared" multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) - $(use_enable stats) + local myconf=() + + if use hardened ; then + myconf+=( --disable-syscall ) + fi + + ECONF_SOURCE="${S}" \ + econf \ + $(use_enable debug) \ + $(use_enable stats) \ + "${myconf[@]}" } multilib_src_install() {
