Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/mimalloc/, dev-libs/mimalloc/files/
Date: Sat, 01 Jan 2022 09:39:02
Message-Id: 1641029908.a9297d2a382595d3847f1459d64d442f220ada0b.sam@gentoo
1 commit: a9297d2a382595d3847f1459d64d442f220ada0b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 1 09:34:06 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 1 09:38:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9297d2a
7
8 dev-libs/mimalloc: drop 1.7.2
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-libs/mimalloc/Manifest | 1 -
13 .../files/mimalloc-1.7.2-GNUInstallDirs.patch | 29 --------------------
14 dev-libs/mimalloc/mimalloc-1.7.2.ebuild | 32 ----------------------
15 dev-libs/mimalloc/mimalloc-1.7.3.ebuild | 4 ---
16 4 files changed, 66 deletions(-)
17
18 diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
19 index 3ca71f19477a..5cb0dce7a530 100644
20 --- a/dev-libs/mimalloc/Manifest
21 +++ b/dev-libs/mimalloc/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST mimalloc-1.7.2.tar.gz 903317 BLAKE2B 6983a575c8e3a9ee92acc0042bc229805b7090794de6e693ff1cc344cd50e333d46f23663fbd16647ae4442b28f24bdc2043b46ed2bc16e13c3f8def08b155bb SHA512 5d78c5cc00dfff3dd7eb4bb59e8eff32397f5110d1183b4656cb56c40b88e2e648e3b18338119412b95ba9526937b16fce3aa4732f241a61a546e2bcea1efc9d
24 DIST mimalloc-1.7.3.tar.gz 908042 BLAKE2B 6a96fc33148261e3f69a55196725bb2cf2e45f08a668b3d74fd6e06f808c1ce40fbb4783c5df50abe58dbae8b9c1dd264e6fcc6cce0a259b2cbec397d4667736 SHA512 e5a17b98d77a27d2a544869c2e0302a7e3bf77b5b494b2ee8ddc7af18bf9da152fea41702a8a17eb7e128238259fba6f96fa5bac549f5927453dc9a0bc06d013
25 DIST mimalloc-2.0.3.tar.gz 917461 BLAKE2B 4b803881ab75afa358cb2dd251268c0934472074bf1983c3851a9d4f8c8ec0ea3907b52c40b0efe1cc09916cf4c5aa93f786a606e0b999536118b91bb5800310 SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f
26
27 diff --git a/dev-libs/mimalloc/files/mimalloc-1.7.2-GNUInstallDirs.patch b/dev-libs/mimalloc/files/mimalloc-1.7.2-GNUInstallDirs.patch
28 deleted file mode 100644
29 index 99b86f311264..000000000000
30 --- a/dev-libs/mimalloc/files/mimalloc-1.7.2-GNUInstallDirs.patch
31 +++ /dev/null
32 @@ -1,29 +0,0 @@
33 -https://github.com/microsoft/mimalloc/pull/463
34 -
35 -From: Yaroslav Syrytsia <me@××.lc>
36 -Date: Tue, 28 Sep 2021 20:34:56 +0300
37 -Subject: [PATCH] cmake: removed hardcoded names for top level configuration
38 -
39 ---- a/CMakeLists.txt
40 -+++ b/CMakeLists.txt
41 -@@ -24,6 +24,7 @@ option(MI_DEBUG_UBSAN "Build with undefined-behavior sanitizer (needs clan
42 - option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode (deprecated, use MI_DEBUG_FULL instead)" OFF)
43 - option(MI_INSTALL_TOPLEVEL "Install directly into $CMAKE_INSTALL_PREFIX instead of PREFIX/lib/mimalloc-version" OFF)
44 -
45 -+include(GNUInstallDirs)
46 - include("cmake/mimalloc-config-version.cmake")
47 -
48 - set(mi_sources
49 -@@ -208,9 +209,9 @@ endif()
50 - # -----------------------------------------------------------------------------
51 -
52 - if (MI_INSTALL_TOPLEVEL)
53 -- set(mi_install_libdir "lib")
54 -- set(mi_install_incdir "include")
55 -- set(mi_install_cmakedir "cmake")
56 -+ set(mi_install_libdir "${CMAKE_INSTALL_LIBDIR}")
57 -+ set(mi_install_incdir "${CMAKE_INSTALL_INCLUDEDIR}")
58 -+ set(mi_install_cmakedir "${CMAKE_INSTALL_LIBDIR}/cmake/mimalloc")
59 - else()
60 - set(mi_install_libdir "lib/mimalloc-${mi_version}")
61 - set(mi_install_incdir "include/mimalloc-${mi_version}")
62
63 diff --git a/dev-libs/mimalloc/mimalloc-1.7.2.ebuild b/dev-libs/mimalloc/mimalloc-1.7.2.ebuild
64 deleted file mode 100644
65 index 33efb631d03b..000000000000
66 --- a/dev-libs/mimalloc/mimalloc-1.7.2.ebuild
67 +++ /dev/null
68 @@ -1,32 +0,0 @@
69 -# Copyright 2021 Gentoo Authors
70 -# Distributed under the terms of the GNU General Public License v2
71 -
72 -EAPI=8
73 -
74 -inherit cmake
75 -
76 -DESCRIPTION="mimalloc is a compact general purpose allocator with excellent performance"
77 -HOMEPAGE="https://github.com/microsoft/mimalloc"
78 -SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
79 -
80 -LICENSE="MIT"
81 -SLOT="0/1"
82 -KEYWORDS="~amd64"
83 -IUSE="test"
84 -RESTRICT="!test? ( test )"
85 -
86 -PATCHES=(
87 - "${FILESDIR}"/${PN}-1.7.2-GNUInstallDirs.patch
88 -)
89 -
90 -src_configure() {
91 - local mycmakeargs=(
92 - # TODO: build hardened variant?
93 - #-DMI_SECURE=$(usex hardened)
94 -
95 - -DMI_INSTALL_TOPLEVEL=ON
96 - -DMI_BUILD_TESTS=$(usex test)
97 - )
98 -
99 - cmake_src_configure
100 -}
101
102 diff --git a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild b/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
103 index 40b252a87e40..92240c28bfd1 100644
104 --- a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
105 +++ b/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
106 @@ -15,10 +15,6 @@ KEYWORDS="~amd64"
107 IUSE="test"
108 RESTRICT="!test? ( test )"
109
110 -PATCHES=(
111 -# "${FILESDIR}"/${PN}-1.7.2-GNUInstallDirs.patch
112 -)
113 -
114 src_configure() {
115 local mycmakeargs=(
116 # TODO: build hardened variant?