From patchwork Wed Aug 25 18:02:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32250 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 00BB727BBE3; Wed, 25 Aug 2021 19:04:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BBEBE27BBE1 for ; Wed, 25 Aug 2021 19:04:15 +0100 (BST) Received: from localhost ([::1]:55460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxG2-0007qO-Qb for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFr-0007pS-0V for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFq-0000nP-PW for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFq-0002mH-LJ for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 03/52] gnu: elogind: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991462510370 (code B ref 50201); Wed, 25 Aug 2021 18:04:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:45 +0000 Received: from localhost ([127.0.0.1]:47611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFX-0002gf-Ly for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:44 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFV-0002ft-0Y for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:41 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3gT0; Wed, 25 Aug 2021 20:03:40 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:43 +0200 Message-Id: <20210825180332.5720-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914620; bh=8mKjxkd3JNJoIdwZnTrV1aelukG3WYjEvqoBuHQblIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=r4Z+L59Oa4eS/bHnXa+aG5R30kur9JWH8jHQ5MOjlXRCXLBqoXmxACNB8S0kF2RGO uMH3TZqtueAJQsjVx8NjCou96DS95Wijl8g/fzaXAgdK9juc1++/9DprPYrQ2o1MWu muLquJjmozKZmMxR5drjLeA2Sk0BIvN08KlGr7FwcAqU68F15Slxt2GK7CcpHqX5n+ pzk8vpstNQ4Ju+hs8DzFEYlRfAIbiHCA3IUBe49dQSUw7SgnFhepyQwOINTIoOW/Ts uCWJK70tjrdPDfxfRLHlcFRVFhvDy1p7VYoT9EBo0sLzxy4cct3Tu955CVVvp1eY/q HEgxn1UwpXU5w== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs and friends don't exist when cross-compiling, so use some G-expology instead. * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Don't use '%outputs' or '%build-inputs' when cross-compiling. --- gnu/packages/freedesktop.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e0f5623805..0f6bb72a1f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -580,12 +580,20 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ,#~(let* ((out (assoc-ref %outputs "out")) + ;; TODO(core-updates): Use #$output unconditionally. + ,#~(let* ((out #$(if (%current-target-system) + #~#$output + #~(assoc-ref %outputs "out"))) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - (shadow (assoc-ref %build-inputs "shadow")) - (shepherd (assoc-ref %build-inputs "shepherd")) + ;; TODO(core-updates): use this-package-input unconditionally. + (shadow #$(if (%current-target-system) + (this-package-input "shadow") + #~(assoc-ref %build-inputs "shadow"))) + (shepherd #$(if (%current-target-system) + (this-package-input "shepherd") + #~(assoc-ref %build-inputs "shepherd"))) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin"))