From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ME/yM2it3GRmmgAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 13:05:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +HBjM2it3GTZSAAAauVa8A (envelope-from ) for ; Wed, 16 Aug 2023 13:05:12 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6997D60F25 for ; Wed, 16 Aug 2023 13:05:12 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=OoN4c2XK; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692183912; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=5sxCKK4KOhGR3aQZFXwFyjK4rt2dC2xWWOCGWGL+Nhk=; b=SxT1+p3Ev89JG2mWHw4MsLE4NjElVz/pptU2koPSWAq27zpx4+uCPH1+Fy9RRgl4NFmDAv k7Xg/ZAHMF6kjIpoyyBmoU55qdoZAw4cQeuB0jcuL3c1lpYioaost4NbJBSSEnRs8s82pR crp84004tJDVfe3wmPSE2lY2Xmq31rO4JtAoqOlj6rsTVTCG75QjtoY/WTg74qTnmxk76R gGQKS74dKqqLraQcao2SEVDDcTfs/qz2GadrQ4qxB3C69aYKtYxNBKhD5UEg4RU5CP+Lmb rfaaORpfwQfAyhf34A77hrZXzNX8iz42GogqV8stxOSWrwCaKhQGKsJK7RxHag== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=OoN4c2XK; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692183912; a=rsa-sha256; cv=none; b=VM2y7R4evOfIvIUPwY0jrVPvgGNvJD9pHYFAjbTBAcvlfRIKzUAjnp4GKdUg7JTCqM5xhi fULppIhUmVxKeD1ObjMxTWaTqiPkjePAJAI5J1iZH6Pu83fiqrrYXhdwUIIfWicyo4RH2E 2XfwVDlZFuThdtW14CUEfrXfphtYGwGWxH9ThUeNilKSazmHjl/9na0lTQTH3X1cf0/PJR FTrFFZs0ExHYtEs8hxYn0TVzczS7fFUjHOWUx7rmRNJWOlZ2QmXfidxqTHtN2fhhZslNjX Fl2d0z3AQs9WFIRowlRwfF23m55IxhvJb+CLFbaOnmVsas+cQ/lDI2gurihtpw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWEKm-0002CA-Sn; Wed, 16 Aug 2023 07:05:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWEKk-0002BJ-So for guix-patches@gnu.org; Wed, 16 Aug 2023 07:05:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWEKk-00040H-JE for guix-patches@gnu.org; Wed, 16 Aug 2023 07:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWEKk-0000rS-1R for guix-patches@gnu.org; Wed, 16 Aug 2023 07:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH] gnu: extra-cmake-modules: Fix libexec path. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 11:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Cc: Sughosha Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.16921838953295 (code B ref 64798); Wed, 16 Aug 2023 11:05:01 +0000 Received: (at 64798) by debbugs.gnu.org; 16 Aug 2023 11:04:55 +0000 Received: from localhost ([127.0.0.1]:38949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWEKc-0000r5-V0 for submit@debbugs.gnu.org; Wed, 16 Aug 2023 07:04:55 -0400 Received: from layka.disroot.org ([178.21.23.139]:34668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWEKa-0000qr-CZ for 64798@debbugs.gnu.org; Wed, 16 Aug 2023 07:04:53 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1AEA740F0B; Wed, 16 Aug 2023 13:04:51 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oG8v06cp1xRk; Wed, 16 Aug 2023 13:04:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1692183890; bh=/A5IGsxmSDUTC49XV7MGjhfRf8rt3u9Qe0vWcbujGbk=; h=From:To:Cc:Subject:Date; b=OoN4c2XKFsOKW3cxFMCTjkjSHAMxvy5Wqvqo/hwDPrVNNUY3q1NYr4S3t4J6XHHjf eVLm72QzFjUfmdSsC49pcyFiohJ7UMJttDg8uq+k0UqUjs9nZ55mME+91X2X6nF1/A eFUtGhzbXYiaBcObEFmP39nSDWAJOnz64TCQQGZ6zu6T6TLaN1UB4Q5Z5XZaLLAtKy bOCZRADegNk4wZlMCSGfx2iDOcCKKtrzhMDkCL6p0nkhjp7pxdCaEXpSryW1YG8fFm E4qAoY5DAlQxq068xc00DrEP9D8ZLbgOahUiWxA5a0u3ECWs+alx1rcLm+GVszTu2G N9bECgdSR8tzA== Date: Wed, 16 Aug 2023 13:04:26 +0200 Message-ID: <2c7636ade65eec0efdc5d0ae82313311450ae463.1692183506.git.sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches From: Sughosha via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -6.19 X-Migadu-Queue-Id: 6997D60F25 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -6.19 X-TUID: v0xQEcxKkVC5 * gnu/packages/kde-frameworks.scm (extra-cmake-modules)[#:phases]: Fix libexec path. --- gnu/packages/kde-frameworks.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9778d9a1c6..ec7b5c041b 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -126,11 +126,13 @@ (define-public extra-cmake-modules (not (null? (package-native-inputs this-package)))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-lib-path + (add-after 'unpack 'fix-lib-and-libexec-path (lambda _ - ;; Always install into /lib and not into /lib64. (substitute* "kde-modules/KDEInstallDirsCommon.cmake" - (("\"lib64\"") "\"lib\"")) + ;; Always install into /lib and not into /lib64. + (("\"lib64\"") "\"lib\"") + ;; Install into /libexec and not into /lib/libexec. + (("LIBDIR \"libexec\"") "EXECROOTDIR \"libexec\"")) ;; Determine the install path by the major version of Qt. ;; TODO: Base the following on values taken from Qt base-commit: 461602d07c8da0e29bae392270f4ef3fd4f7fffb -- 2.41.0