From nobody Mon Jan 13 15:23:55 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YWwyg3w9pz5kPH7; Mon, 13 Jan 2025 15:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YWwyg3BMkz43B2; Mon, 13 Jan 2025 15:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736781835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HnMSTIRf6pM8QiQae7I6xhLcngzjuPRuLZLBu2Hi9Vs=; b=fhWoICprsGuvGAS+Z9r6EByZZ8MImKO/GqCahJwO70ErPARNCVyfFfnRH80iD0qYVnmT9c QGQXtxubR2Y3e5tLa9HORfj6M97Ov3Y+FHQHiaXEfiR9OVtsYd+XT4i9fQs0jDqJ3AV97n ZCLyebFkITaDqGJ2FJYoMmnvjGb2gSVr63XCPoropupkJxRaSTQp1S1BbvcANfoGX+dVNB rblp50wc4kU0RzRRB/aULqXJbmEPMJv5ANlqKBLdMGLjQW7u1VTJ/bs7FK/nRPbVGokoIE n9oRQPcNJK7kFNrQtz50+UuXSz+uDmNZXhEP1EybDyxjZjiLlykJzfaj1Q56/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736781835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HnMSTIRf6pM8QiQae7I6xhLcngzjuPRuLZLBu2Hi9Vs=; b=HezFKtTneriioRJyjcZzf0jDEK6exA4iTEspojYTyIfAufRQdl46N88Ugz5QgkXnmt/6fA PtgTZ0A4W/534B5FXSg+hQPrLDqX8xE/ABZO+j0Dhna1DfGoX58BnKE5iA3+hnUWjPzM8b BHrHzrHcvqim7vx1uuSd4/pqeZtoGpLatjuAZiVqYJ7utEfBv1MqzuJcJ9QOC812f8Maed G66ulc1LhR6fawlrNSMPsZnxnQE1Vxk6FoQzpD1klbJ3FvHtiRqxcFnYcqcn1lozFOUVjk 0zZn6Qk/WbHU9MsHsMLddsOIebHLh7a2hn3Cr+7tGebFVbx4AUFIDBZ5Amv31Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736781835; a=rsa-sha256; cv=none; b=GYl+GQ8QK9vxcJCDhbwjPLXdv7ypyL2Dg3rKoyzjrXQWHq33rCi7Yo9iArTyOqdTvd801X ncA6oRX7CnXbe4ec0IvxTbLtRiJqCueOd7RFvdBLC3930qeM0j3qto+Z8mQXRqoopcRFTo E1isWSVvr7DGfIKoeERM4do4SBdFLpWHeRqvlpCyAuzaM9XT+9BNBoCUADW7Am3eMZNVpc eiCekiR3cXiuu24l8OFmSEGMiz1KvPzWftwgoyIgh+gYRL2lWgHn3+hM9i3eYTZdH1pFhw cY0yByY1xHPMAs2SakCBZefAxxrXs8xnF4gezT8W/L8dxzD3L9Pi/dabrlmytA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YWwyg2Xp2zcSs; Mon, 13 Jan 2025 15:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50DFNtbe086886; Mon, 13 Jan 2025 15:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50DFNtQW086883; Mon, 13 Jan 2025 15:23:55 GMT (envelope-from git) Date: Mon, 13 Jan 2025 15:23:55 GMT Message-Id: <202501131523.50DFNtQW086883@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: c990c016d8d5 - main - devel/mimalloc: Update to 3.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c990c016d8d51c768dd6f849129b7492cd016d55 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c990c016d8d51c768dd6f849129b7492cd016d55 commit c990c016d8d51c768dd6f849129b7492cd016d55 Author: Emanuel Haupt AuthorDate: 2025-01-13 15:23:50 +0000 Commit: Emanuel Haupt CommitDate: 2025-01-13 15:23:50 +0000 devel/mimalloc: Update to 3.0.1 Apply patch to fix build [1] Obtained from: https://github.com/microsoft/mimalloc/issues/988 [1] --- devel/mimalloc/Makefile | 2 +- devel/mimalloc/distinfo | 6 +++--- devel/mimalloc/files/patch-CMakeLists.txt | 4 ++-- devel/mimalloc/files/patch-src_prim_unix_prim.c | 12 ++++++++++++ devel/mimalloc/pkg-plist | 4 ++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/devel/mimalloc/Makefile b/devel/mimalloc/Makefile index 3aa4ac5059c1..1d3385f669fa 100644 --- a/devel/mimalloc/Makefile +++ b/devel/mimalloc/Makefile @@ -1,6 +1,6 @@ PORTNAME= mimalloc DISTVERSIONPREFIX= v -DISTVERSION= 2.1.8 +DISTVERSION= 3.0.1 CATEGORIES= devel MAINTAINER= ehaupt@FreeBSD.org diff --git a/devel/mimalloc/distinfo b/devel/mimalloc/distinfo index 08d69587a3be..d1b7a49f47cd 100644 --- a/devel/mimalloc/distinfo +++ b/devel/mimalloc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735990751 -SHA256 (microsoft-mimalloc-v2.1.8_GH0.tar.gz) = 4d7e771b51ba0d3c4a5850d3f7f7f82c1b04af318e1351553f46aa3336439540 -SIZE (microsoft-mimalloc-v2.1.8_GH0.tar.gz) = 1276091 +TIMESTAMP = 1736781220 +SHA256 (microsoft-mimalloc-v3.0.1_GH0.tar.gz) = 6a514ae31254b43e06e2a89fe1cbc9c447fdbf26edc6f794f3eb722f36e28261 +SIZE (microsoft-mimalloc-v3.0.1_GH0.tar.gz) = 1281782 diff --git a/devel/mimalloc/files/patch-CMakeLists.txt b/devel/mimalloc/files/patch-CMakeLists.txt index 9c0f325ff0f1..a6bc3850f094 100644 --- a/devel/mimalloc/files/patch-CMakeLists.txt +++ b/devel/mimalloc/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-04-03 19:32:28 UTC +--- CMakeLists.txt.orig 2025-01-13 15:16:06 UTC +++ CMakeLists.txt -@@ -353,8 +353,8 @@ if(MI_TRACK_ASAN) +@@ -513,8 +513,8 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_ set(mi_basename "${mi_basename}-asan") endif() string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC) diff --git a/devel/mimalloc/files/patch-src_prim_unix_prim.c b/devel/mimalloc/files/patch-src_prim_unix_prim.c new file mode 100644 index 000000000000..53ee443d4dee --- /dev/null +++ b/devel/mimalloc/files/patch-src_prim_unix_prim.c @@ -0,0 +1,12 @@ +--- src/prim/unix/prim.c.orig 2025-01-04 04:21:48 UTC ++++ src/prim/unix/prim.c +@@ -201,7 +201,8 @@ static void* unix_mmap_prim(void* addr, size_t size, s + void* p = NULL; + #if defined(MAP_ALIGNED) // BSD + if (addr == NULL && try_alignment > 1 && (try_alignment % _mi_os_page_size()) == 0) { +- size_t n = mi_bsr(try_alignment); ++ size_t idx; ++ size_t n = mi_bsr(try_alignment, &idx); + if (((size_t)1 << n) == try_alignment && n >= 12 && n <= 30) { // alignment is a power of 2 and 4096 <= alignment <= 1GiB + p = mmap(addr, size, protect_flags, flags | MAP_ALIGNED(n), fd, 0); + if (p==MAP_FAILED || !_mi_is_aligned(p,try_alignment)) { diff --git a/devel/mimalloc/pkg-plist b/devel/mimalloc/pkg-plist index 7b9cc29f8afc..780f28538d8f 100644 --- a/devel/mimalloc/pkg-plist +++ b/devel/mimalloc/pkg-plist @@ -7,6 +7,6 @@ lib/cmake/mimalloc/mimalloc-config.cmake lib/cmake/mimalloc/mimalloc.cmake lib/libmimalloc.a lib/libmimalloc.so -lib/libmimalloc.so.2 -lib/libmimalloc.so.2.1 +lib/libmimalloc.so.3 +lib/libmimalloc.so.3.0 libdata/pkgconfig/mimalloc.pc