From nobody Tue Apr 12 08:41:48 2022 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 49A1E11DE191; Tue, 12 Apr 2022 08:41:49 +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 4KczjT1WxHz3N1L; Tue, 12 Apr 2022 08:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649752909; 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=5gBSkRL+90VqHjETEhoEBZNY7KdYWMpR5TgeSChhFXg=; b=ZznKqWGijzQTlJcguvQvBCstJjPyMJ8YgJIj4Fh1WApXCpzjx+W9SDTQmKqldp6WDA5nc7 jD+PUKt8Ez/79OBfdPKocppdIsE99ViYNA+EPLCwJKgtq96PwWEsQw59Z/728VmDMlf05b h7mcrNzPcqiom+R7Bw2qWKrlBHHEMniUwfQqHYtE6gOKmRXLvkPyChPMbgspYYx22T6KEd 9ZLeOPQphPGEtca0rkmgrTQr0wzLRtzlHLeQqfRb5t2iCsGuWein2N3o66947YQ6TjFNR4 yrE5YFyj1OMRc3pXZBmvHBQ6U/qPp+RU5PSJdsU2VlqPebMyQe3P/MtrSA+P6A== 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 14F8114434; Tue, 12 Apr 2022 08:41:49 +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 23C8fmuG063306; Tue, 12 Apr 2022 08:41:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23C8fmVX063305; Tue, 12 Apr 2022 08:41:48 GMT (envelope-from git) Date: Tue, 12 Apr 2022 08:41:48 GMT Message-Id: <202204120841.23C8fmVX063305@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: 2cba286258af - main - devel/mimalloc: fix install wiht WITH_DEBUG 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 2cba286258af03d7880db549f64678919040c85c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649752909; 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=5gBSkRL+90VqHjETEhoEBZNY7KdYWMpR5TgeSChhFXg=; b=MAvHBqN6t3ScijTkHAgniLm9z2W6axnFaJ08YH0CMHVGKRqYRvECfQZ6/YKcAQV6WmvXzd F4xDyKOWcM/JPUUh98T3u3qZfOXwVsHOVeB9+KY66Wm31r43JVkM8aryWO1Qp2QTmW+lKO ol0iROI6M4+kuxVpSFTALutSYeYnmJVmftU/EDs/PXF4LNhaIeUnMPYLJLtwGRQZy1225p g1uJzJlLFOs2u/yUxvoGAKQJ8V/ERar5V3TEwvexgY6PY6seA89kkrnT83LN4b3LREo6Dm DDH3/PuultwjCK1RAzj4SWa9dKKDZDRlYmUwxX/harZnuHIGzjztvIPOgoWAgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649752909; a=rsa-sha256; cv=none; b=O5N1CiHgBbnEFOg1WJ48+LTXN7PNsP+1wQ/rQGfDRzw/T4ZGf0cTB5ySgWwipLtCN4sTty ezTeknliLAS3C0x6J4QDCsnCdi6FyjmpVcQw0uDlqNvU5RyFoowMVMj+yiUdySxMYipJau eLXGNL9tTCLNJ3c8ju2QQb4UnlArV5JD29X9DjHtDQjHlmusZ0bmGu5cmjAhrzK8bgqr9f ow+j0IYMKbAnfUwclFyDpQgD+2pMPJMfB6+XEWyD7SmzMSr8mseq9ALdcBkck5LmqBh553 UMhlh8/8Ve4lo97Ickj9fW+CpzKGCFVrf+0vv06d5PIWZV+A/LqoLkgGaW5mjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=2cba286258af03d7880db549f64678919040c85c commit 2cba286258af03d7880db549f64678919040c85c Author: Emanuel Haupt AuthorDate: 2022-04-12 08:37:16 +0000 Commit: Emanuel Haupt CommitDate: 2022-04-12 08:41:41 +0000 devel/mimalloc: fix install wiht WITH_DEBUG If WITH_DEBUG is defined shared objects are installed with -debug suffix. This not only fails to install but would also break consumers. Patch CMakeLists.txt accordingly. Reported by: koobs (via irc) --- devel/mimalloc/files/patch-CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/devel/mimalloc/files/patch-CMakeLists.txt b/devel/mimalloc/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..7c9fce5c9d33 --- /dev/null +++ b/devel/mimalloc/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2022-02-15 00:44:33 UTC ++++ CMakeLists.txt +@@ -258,8 +258,8 @@ else() + 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")