From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C1AC15807A for ; Fri, 06 Jun 2025 04:04:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 216DD343102 for ; Fri, 06 Jun 2025 04:04:41 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1D8221102BE; Fri, 06 Jun 2025 04:04:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 106431102BE for ; Fri, 06 Jun 2025 04:04:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B07C8343102 for ; Fri, 06 Jun 2025 04:04:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4936A2059 for ; Fri, 06 Jun 2025 04:04:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1749182636.9d349ff7f635e777166b16d110afd93debeb6b7c.sam@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9d349ff7f635e777166b16d110afd93debeb6b7c X-VCS-Branch: master Date: Fri, 06 Jun 2025 04:04:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6f9a487-8636-404f-b91d-ca12f3aeebc1 X-Archives-Hash: cfb8cdd13716dc2147ba8dc4070f6247 commit: 9d349ff7f635e777166b16d110afd93debeb6b7c Author: Sam James gentoo org> AuthorDate: Fri Jun 6 04:03:56 2025 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 6 04:03:56 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d349ff7 cmake.eclass: quote "${file}" for seds Otherwise sed may fail (as it can't find the files) on directories/files with spaces in the path, as is the case in dev-build/cmake itself where it'll die in src_prepare. Signed-off-by: Sam James gentoo.org> eclass/cmake.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 07216f0b9f..b6d9677008 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -255,8 +255,8 @@ _cmake_modify-cmakelists() { sed \ -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_BUILD_TYPE\([[:space:]].*)\|)\)/I{s/^/#_cmake_modify_IGNORE /g}' \ -e '/^[[:space:]]*set[[:space:]]*([[:space:]]*CMAKE_\(COLOR_MAKEFILE\|INSTALL_PREFIX\|VERBOSE_MAKEFILE\)[[:space:]].*)/I{s/^/#_cmake_modify_IGNORE /g}' \ - -i ${file} || die "failed to disable hardcoded settings" - readarray -t mod_lines < <(grep -se "^#_cmake_modify_IGNORE" ${file}) + -i "${file}" || die "failed to disable hardcoded settings" + readarray -t mod_lines < <(grep -se "^#_cmake_modify_IGNORE" "${file}") if [[ ${#mod_lines[*]} -gt 0 ]]; then einfo "Hardcoded definition(s) removed in ${file/${CMAKE_USE_DIR%\/}\//}:" local mod_line