From nobody Wed Apr 12 15:23:50 2023 X-Original-To: dev-commits-ports-branches@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 4PxRLv3YNmz44xcQ; Wed, 12 Apr 2023 15:23:51 +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 4PxRLv1Pc1z4Gvd; Wed, 12 Apr 2023 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313031; 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=/U2UXO+7BNM4busZohewLsmNQbllUIGbBaX4TvI/THU=; b=xUx1B0GuruoCxmIk6KqoAyzcMAhjvPueBVXAkuIekvnn4K8NbmE6HvMaNoFDuoolU4V01g KkkYdpAh0LfIzwIpz05b2d1dnNCpXMy1tJ+46jyHQ0NWmbHMRx8WA2vfr3nm/P4eiIUhuO UMb20ip4bNznZqXR9QD9/8xhqaqeqNcsXduJVYOnEKV1B3sVszqmz+On30O8PfnbHgKFQD aG7hgEfxALxUkultZO2P48+9ECd10uj6zKOkZISUdE4iVygY8qVP6NEfh6IuT0NAbhEL/C ZnQNFeUV0VUHCdZd+6lcX3h4kVx5Zi6lmkMWcSgaXHmbqAQhQx+oOXCpgk2ewQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313031; 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=/U2UXO+7BNM4busZohewLsmNQbllUIGbBaX4TvI/THU=; b=XIobxsANS3oLR6CCYyq7NDNQkGgSUet5wmXrA31MnUTEW69VbGxRszLZX112DTM9WN3Sci dps4B9vatWcRVUnr1r8m8nyAKa7i4QkzGSQxcDI2H5bn4tkn4vlvnSBCE2QDpjgJRK2Jwy poAj7OeKbwAkbTKRK3BFsZ4f84U8HsIozD0UuuuQcvCNlPgxSCv3fDjNeDkXtiCYfCRVOY ue5LLpEXQ2O8H6xigTyfpGy88ussK3XEZ1axa4d50ZfQomtkZ2vQb1L/YLLvUbB/0t726t 8ZcSDm3Kbs01iBcBGnt3B0sSorsncCUaI6ane+nKCuQyWrNr4vEZlH6HwSzOmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681313031; a=rsa-sha256; cv=none; b=UZBRjfR8NsmjOPCioXlME75khqftw3texpGdYGWZD/jE9I3z4g3nfSa8gpEwaVNC6ndaTI 0Gj3EG3EtaAXaYY93r019JFygjZXQ5EnXXV8nJhSSEKwIAU/8Gqr3QSq6FOuX7OVQoUnzn 6Nz51VJNSW0k03lsVrKIhR8mi/W13WkVVgB0hcMHaEBw11NDtdki3Sd6EpFuHD/RCk7Nl4 4UWRKH7cGscA1pBD3RMJFsXK8J9/cTYVq00xpEKcw6JQdIQU9Ae03RHx9ew43fpuEDko4D Vd/3DMHZU4KCqjegteas7Q3aoElRF1dvxwAUewM7C9VE4dfiwbwqykC7z8lqlg== 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 4PxRLt6x78z14XD; Wed, 12 Apr 2023 15:23:50 +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 33CFNoFx084784; Wed, 12 Apr 2023 15:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CFNoVO084783; Wed, 12 Apr 2023 15:23:50 GMT (envelope-from git) Date: Wed, 12 Apr 2023 15:23:50 GMT Message-Id: <202304121523.33CFNoVO084783@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 229ce3680267 - 2023Q2 - sysutils/cpu-x@ncurses: unbreak the port's packaging under Poudriere List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 229ce36802676a474c0906dd485ca459e556075d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=229ce36802676a474c0906dd485ca459e556075d commit 229ce36802676a474c0906dd485ca459e556075d Author: Alexey Dokuchaev AuthorDate: 2023-04-08 13:05:44 +0000 Commit: Joseph Mingrone CommitDate: 2023-04-12 15:23:04 +0000 sysutils/cpu-x@ncurses: unbreak the port's packaging under Poudriere Back in 2020 diizzy@ had reported that daemon was installed in the wrong path when the port was built under Poudriere without X11 (GTK+) support. This seemed totally odd (and not reproducible in the Tinderbox) so I've scratched my head and put it off for better times. When the port was converted to flavors, the problem had resurfaced: now the ncurses flavor was failing on the cluster! Looking at the CMake code, it calls `include(GNUInstallDirs)' which correctly sets CMAKE_INSTALL_FULL_LIBEXECDIR to `/usr/local/libexec'. The code then checks for its existence, the failure logs indicate that it does not exist, which should not be possible because it is part of the `Templates/BSD.local.dist', so it should be mtree'd inside the build jail. Tinderbox does exactly this, but not Poudriere, so unless this directory is created (populated) by the dependencies or e.g. ccache(1), one cannot assume that it really exists in pristine environment. Regardless of whether mtree'ing jail with `BSD.local.dist' is the right thing or not, checking for some common path existence and setting it to something else if it's not found is definitely wrong. This was a joint investigation by fluffy@ and yours truly. PR: 251785 (cherry picked from commit eb6c9c8c4aa5981078c6b9b69527ecdaee5f22c9) --- sysutils/cpu-x/files/patch-CMakeLists.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sysutils/cpu-x/files/patch-CMakeLists.txt b/sysutils/cpu-x/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..61c772ba735f --- /dev/null +++ b/sysutils/cpu-x/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2023-04-02 10:14:25 UTC ++++ CMakeLists.txt +@@ -14,10 +14,6 @@ project(cpu-x + # Global variables + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + include(GNUInstallDirs) +-if(NOT EXISTS ${CMAKE_INSTALL_FULL_LIBEXECDIR}) +- set(CMAKE_INSTALL_LIBEXECDIR lib/${CMAKE_PROJECT_NAME}) +- set(CMAKE_INSTALL_FULL_LIBEXECDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}) +-endif(NOT EXISTS ${CMAKE_INSTALL_FULL_LIBEXECDIR}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/bin/) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/lib/) + set(CMAKE_DATA_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/data/)