From nobody Fri Apr 7 13:59:15 2023 X-Original-To: dev-commits-ports-all@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 4PtKjb4Y0Tz44gCP; Fri, 7 Apr 2023 13:59:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PtKjb3KW2z4861; Fri, 7 Apr 2023 13:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680875955; 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=F7ZRD5/wIU1Bk0ziWEk0j4BFKW8GBQ9CKFP1tmE02Ac=; b=NZ06kz9jy+OZrctPcOkDNJaq86Q0sS6uR2qe89kQx2d6T4t2L/sVZQZfK0+IB+zWgxe6dE 56ujU8i9ha39qcMjFFZz0ITTuKd/UYT68iqjfmzUFFFz7QdN2leKzJxedWEH6eMui4Kjx8 7hsogyTWVlepwrg00cTWPBA+dswPnWTkNVbOiKgzyGu+9MXtTQ7Mh0PCHOUf904UZhqs5o YoR6VmMcMIr61f006NAkejSCU6q6x0MIeu3ce9yZqnrRA2joIZJ6y9DkieqKzO9XaBsCWj KhXTI+W7FBbGxYLxJKY/MOdooD4C0cuBX3pbNrH06wS+44EZAjo9PsDdxAsncA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680875955; 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=F7ZRD5/wIU1Bk0ziWEk0j4BFKW8GBQ9CKFP1tmE02Ac=; b=TiRJ2GT939k4A0eqiBmvQBe+dcXAgWKbxIYsdJt82JWvUjggNNSy2/b0DkumbdtYMXotKS 4v0JqIFzNgVLNyCN0DB6VT2Rutk+dSAidVtuLU++dF+CJQqniQr267d7Ul9I4jj/bD7M3Q 1PTnpZ42Vd7JIKmwYnj1Bx5/3mXG7lPtl22jmgVGXI1zCeJbolNH3QF+7bOsOPNOX9Vj+2 hzvb4bcg1h/NCWf/RmdddG2iCUq/0DtQ8BKzd546fw5FWDIEQfmY0pPQOAlATfQ5ReLnAP BvVo9NZ3yFe2aMYRjGm25zi0o92UFLsqTXPycgokHg6UYK6E7GGMrKUfodnjEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680875955; a=rsa-sha256; cv=none; b=FtHldUxbmMCDbnJSvhebzBsYE8qeELnNnIq2vJrKyjZbxVjnf3eG2nMbsv6FTWKdvz0Jdh GllpIi9pLBS7I/LMe/e178Mt663r8BvKFkslOVe+zx8eewkmi0iYtprzFcdYUOMn+dM319 kpLw6KW5caawtzwyGWipEvrg3O7Q/GCupPurIvoW2aqxXqtysigdnlCbS9RdT3BHOOURjJ gWTxTNDK7UXhwn7h3IVwmCHoTgRw1PRFP2leeUPFerUi3AEnLkGsnWiGOannw9UUHQ6Eyy 7de61MmzDhix/v1yRUCnNNnT8+e9iJm8Dc/ohJehHwSR9bOf1XTbpGVva0ShIg== 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 4PtKjb2JxtznFh; Fri, 7 Apr 2023 13:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 337DxFi3064976; Fri, 7 Apr 2023 13:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 337DxFPo064975; Fri, 7 Apr 2023 13:59:15 GMT (envelope-from git) Date: Fri, 7 Apr 2023 13:59:15 GMT Message-Id: <202304071359.337DxFPo064975@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: 9504824dedc9 - main - devel/mimalloc: Update to 2.1.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 9504824dedc9f906d239cabfa1522fc0ffa68b53 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9504824dedc9f906d239cabfa1522fc0ffa68b53 commit 9504824dedc9f906d239cabfa1522fc0ffa68b53 Author: Emanuel Haupt AuthorDate: 2023-04-07 13:59:09 +0000 Commit: Emanuel Haupt CommitDate: 2023-04-07 13:59:09 +0000 devel/mimalloc: Update to 2.1.1 Upstream issue: https://github.com/microsoft/mimalloc/issues/722 --- devel/mimalloc/Makefile | 3 +-- devel/mimalloc/distinfo | 6 +++--- devel/mimalloc/files/patch-CMakeLists.txt | 8 ++++---- devel/mimalloc/files/patch-src_prim_unix_prim.c | 11 +++++++++++ devel/mimalloc/pkg-plist | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/devel/mimalloc/Makefile b/devel/mimalloc/Makefile index 0bd0ac3c114d..64fb57a1040d 100644 --- a/devel/mimalloc/Makefile +++ b/devel/mimalloc/Makefile @@ -1,7 +1,6 @@ PORTNAME= mimalloc DISTVERSIONPREFIX= v -DISTVERSION= 2.0.9 -PORTREVISION= 1 +DISTVERSION= 2.1.1 CATEGORIES= devel MAINTAINER= ehaupt@FreeBSD.org diff --git a/devel/mimalloc/distinfo b/devel/mimalloc/distinfo index 9a77f938e89a..14b553e736a4 100644 --- a/devel/mimalloc/distinfo +++ b/devel/mimalloc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672157511 -SHA256 (microsoft-mimalloc-v2.0.9_GH0.tar.gz) = 4a29edae32a914a706715e2ac8e7e4109e25353212edeed0888f4e3e15db5850 -SIZE (microsoft-mimalloc-v2.0.9_GH0.tar.gz) = 1143452 +TIMESTAMP = 1680853346 +SHA256 (microsoft-mimalloc-v2.1.1_GH0.tar.gz) = 38b9660d0d1b8a732160191609b64057d8ccc3811ab18b7607bc93ca63a6010f +SIZE (microsoft-mimalloc-v2.1.1_GH0.tar.gz) = 1163057 diff --git a/devel/mimalloc/files/patch-CMakeLists.txt b/devel/mimalloc/files/patch-CMakeLists.txt index 7c9fce5c9d33..9c0f325ff0f1 100644 --- a/devel/mimalloc/files/patch-CMakeLists.txt +++ b/devel/mimalloc/files/patch-CMakeLists.txt @@ -1,13 +1,13 @@ ---- CMakeLists.txt.orig 2022-02-15 00:44:33 UTC +--- CMakeLists.txt.orig 2023-04-03 19:32:28 UTC +++ CMakeLists.txt -@@ -258,8 +258,8 @@ else() +@@ -353,8 +353,8 @@ if(MI_TRACK_ASAN) + set(mi_basename "${mi_basename}-asan") endif() - string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC) -if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$")) - set(mi_basename "${mi_basename}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version +if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(debug|release|relwithdebinfo|minsizerel|none)$")) + set(mi_basename "${mi_basename}-${CMAKE_BUILD_TYPE_LC}") #append build type if not a release version or debug endif() + if(MI_BUILD_SHARED) - list(APPEND mi_build_targets "shared") 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..f74eb8199eaa --- /dev/null +++ b/devel/mimalloc/files/patch-src_prim_unix_prim.c @@ -0,0 +1,11 @@ +--- src/prim/unix/prim.c.orig 2023-04-03 19:32:28 UTC ++++ src/prim/unix/prim.c +@@ -169,7 +169,7 @@ static void* unix_mmap_prim(void* addr, size_t size, s + p = mmap(addr, size, protect_flags, flags | MAP_ALIGNED(n), fd, 0); + if (p==MAP_FAILED || !_mi_is_aligned(p,try_alignment)) { + int err = errno; +- _mi_warning_message("unable to directly request aligned OS memory (error: %d (0x%x), size: 0x%zx bytes, alignment: 0x%zx, hint address: %p)\n", err, err, size, try_alignment, hint); ++ _mi_warning_message("unable to directly request aligned OS memory (error: %d (0x%x), size: 0x%zx bytes, alignment: 0x%zx, hint address: %p)\n", err, err, size, try_alignment, addr); + } + if (p!=MAP_FAILED) return p; + // fall back to regular mmap diff --git a/devel/mimalloc/pkg-plist b/devel/mimalloc/pkg-plist index 1365b5fb7855..7b9cc29f8afc 100644 --- a/devel/mimalloc/pkg-plist +++ b/devel/mimalloc/pkg-plist @@ -8,5 +8,5 @@ lib/cmake/mimalloc/mimalloc.cmake lib/libmimalloc.a lib/libmimalloc.so lib/libmimalloc.so.2 -lib/libmimalloc.so.2.0 +lib/libmimalloc.so.2.1 libdata/pkgconfig/mimalloc.pc