From nobody Tue Apr 12 08:42:47 2022 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 4DC3E11DE831; Tue, 12 Apr 2022 08:42:48 +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 4Kczkc1Jhwz3P5h; Tue, 12 Apr 2022 08:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649752968; 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=Zzg8VbkF++k/oJ475+qwqNaeBLBbaIzpPdSvTB4nhIA=; b=OEqLKB6K7GWjGQhU84t1EMmjaagUPZJNBAnlPp6E3CQg5Ouvro31PJW3kVvGpTRce6SrZT 0T3Oa1ujCarVSDMwWcPrdO++ft3h3I6iLtgoSbehVevPGeypPDR6VTAN5l5jicosHMYvMN POX9AAozw4hskuVugoMobCWrxEPBEtYFZYgqhu5f0YYTDoVzvnz2mJwRyCF+SNB+wz4wr0 TPkhjtc6EzAlbA0QLOsN60+qVzlv2ZnB7CQLkwBmOUziszQ3NjzpsGvKrljTVXJ+ickaAA 7CZcC2OiS9B4QKCXw0Wn3fRYwUxNe5l68JLF85do0H/YzBc7FKngozAbvk8RmA== 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 EB9D414050; Tue, 12 Apr 2022 08:42:47 +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 23C8glfF066535; Tue, 12 Apr 2022 08:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23C8glNJ066534; Tue, 12 Apr 2022 08:42:47 GMT (envelope-from git) Date: Tue, 12 Apr 2022 08:42:47 GMT Message-Id: <202204120842.23C8glNJ066534@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emanuel Haupt Subject: git: 2e9e32cb83ff - 2022Q2 - devel/mimalloc: fix install wiht WITH_DEBUG 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 2e9e32cb83ff0ab900c891f4ebd81443b999fcaa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649752968; 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=Zzg8VbkF++k/oJ475+qwqNaeBLBbaIzpPdSvTB4nhIA=; b=f2WNkHja0QzLCsWclVP6TqKbC0hqgrHri5IW8DwcC2wKWM7vjVjDYbJgzb2QFrjmEqj8Z3 3El8l5WZXwBkkff0+cq1ZBR+/88/xfii6kRcuBoxVX/sGPdb8gV4RTRJafR3uy/B34nQZB Fs4bWtpbZbvXUHZ2jwCOsZyWGh5I/VorbGNyryj4zu6Yq1yA7Y322Z8/9dQS2tubs3xeCK pYOD7ZkaFzYKGI+NyAPh9D5lUWpvn7RJq/M+DIbqJjK8RuCptWLaGE7esGgtZtMdsBQPy1 IUg8OUGyzYhP7HQpyjzTbgUkVVnzKtGyrJTSBgCw5HGy3YxZi/jgS3J1sqJ+Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649752968; a=rsa-sha256; cv=none; b=wjTbmFVXJFS00d3ccVsqkEvkk/zHH0MQgCpNbEHdZeiVSQK5fdBsQHunodFywIg5xHh6lg 45xz7uaF05N6zJoOQ0KC66CwQ+WZTWWu8NGSHLaB3oGPBwMeXSlRkpsMWViiPzt/++hvk3 1xi++rcTxraNKcRfP+A2L2p/eIiPJv3SPdku2Knd5d/Ncf+mMEKnsRRh4kpt7QIOKdmwSc w9FwsTCxNsqG/xKDhUjgcq6w3VnoIjvrENkWnRfEcuz4uo1pGfuWtQg19hvATU5cFoUBcV mSc3yAkYA2fEcl/3lR1JMlxouSXdcXohCbTSNBIB3Z/bY114HnegwsF4Q+WJ8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e9e32cb83ff0ab900c891f4ebd81443b999fcaa commit 2e9e32cb83ff0ab900c891f4ebd81443b999fcaa Author: Emanuel Haupt AuthorDate: 2022-04-12 08:37:16 +0000 Commit: Emanuel Haupt CommitDate: 2022-04-12 08:42:39 +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) (cherry picked from commit 2cba286258af03d7880db549f64678919040c85c) --- 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")