From nobody Sat Apr 08 13:06:24 2023 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 4PtwV90v6Tz44Qmr; Sat, 8 Apr 2023 13:06:25 +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 4PtwV90RwTz4dM3; Sat, 8 Apr 2023 13:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680959185; 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=Flx+j/vODllgbWFn8ZgPz6xmP6Q1ACyIwr/zMd0qgtY=; b=DTN3FwTyOF+NPz8SvDFC59H6Gs/1rJA5+OIhQSF4DM4Lx5z+C/jR/V6tgDhN2ZKoVgV0VF BVpWNcPhCR/q/l6XPrFzGisfIPodVHk3e/XmsuaV09VCaMeoUGVegz8Q6M9snHqfH4kAks wbaadlC5NxPxxKBRAgTRaHHFlDnYPCdbUsPm/FpD4e8SkpoGEimgd4BQ9l6LJGbNWFLpnw VQTlW0dYtkvb6vVOqSwJMTZrFUGFjjWhmHClCVm1tby5NimZfIlfLX93Q3Utvximp7vunO BGsMk3VjtgF8s1KKWdTfL8g8Or6KHWi/ox7OaiazHj92PvqHJMVOFzOSofPj8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680959185; 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=Flx+j/vODllgbWFn8ZgPz6xmP6Q1ACyIwr/zMd0qgtY=; b=ftkocAHjZ8OT+EtbP7axd58FDji0rx+j5eafwbPprvmStshMOhrVfJ3N3HLrLyQiEioo8Q oh2kuXbR6xd0MMuLmpWHHHr/37ytJ2mCl2ifM622d1Lsg9Guwzvmje14ppfU6Xxi2egKZt wEEEaHQ2hR5JHA39It1iqNh0/bnTiLdNNLPEfsjSHG9NXRJcf7O/YUHIHHQ2RbjCZuHNfb RrWK0W+6aCmlx7gbGvPrOVnJHnGbE7aWhr8zWrz45QmrAEOch0M46XPUrTPdEWDM9JO/9V cxJPZUV/OfFuSMueGqB+kMopOIE0JMvV+9/fKt8iqH66cboyDd5Taks15s9l5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680959185; a=rsa-sha256; cv=none; b=pIaaG4on+JY/NiZttxwfFALY+G1sOeYumxHtIPvp8586srK6OdjCFpnLZM7wbJhbpuc7dR W6aPXI5AcXL7T83KOTS0oFfNmXeaH633B79n7icNrV5ofbbr9QWdTFWYR7aRJVHVXo2BW3 rEDXMEZIMEi4Pcs/ev8GE0Aw0mLpZlMY725FBvLvvSLd2Fa4gTUsrY4EdUYLdq7cVT5mZo 4+l3rxu6U1tDTasy9rvwHMCg0ELVsno2RY+iTEjAANr/mYGO6Max6db5qLr7rqe6Ol9jPU mASyYNLAxtRiQCn0157kHflpVSIrSxsJmvUu+1ZJEELG1DI2K9ftMx3z95n2YA== 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 4PtwV86F3bzSDp; Sat, 8 Apr 2023 13:06:24 +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 338D6OQV057741; Sat, 8 Apr 2023 13:06:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338D6OWD057740; Sat, 8 Apr 2023 13:06:24 GMT (envelope-from git) Date: Sat, 8 Apr 2023 13:06:24 GMT Message-Id: <202304081306.338D6OWD057740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: eb6c9c8c4aa5 - main - sysutils/cpu-x@ncurses: unbreak the port's packaging under Poudriere 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb6c9c8c4aa5981078c6b9b69527ecdaee5f22c9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb6c9c8c4aa5981078c6b9b69527ecdaee5f22c9 commit eb6c9c8c4aa5981078c6b9b69527ecdaee5f22c9 Author: Alexey Dokuchaev AuthorDate: 2023-04-08 13:05:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-04-08 13:05:44 +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 --- 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/)