From patchwork Wed Nov 17 08:33:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 34559 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 0037327BBE3; Wed, 17 Nov 2021 08:35:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 C6C2427BBE1 for ; Wed, 17 Nov 2021 08:35:10 +0000 (GMT) Received: from localhost ([::1]:58018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnGPO-0005aA-1Q for patchwork@mira.cbaines.net; Wed, 17 Nov 2021 03:35:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnGPG-0005Zy-QP for guix-patches@gnu.org; Wed, 17 Nov 2021 03:35:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnGPG-00033p-IY for guix-patches@gnu.org; Wed, 17 Nov 2021 03:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnGPG-0002ik-Ax for guix-patches@gnu.org; Wed, 17 Nov 2021 03:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51914] [PATCH 1/2] build-system/asdf: Don't fail in sbcl-package->cl-source-package on non-package inputs. References: <20211117082905.29499-1-mail@ambrevar.xyz> In-Reply-To: <20211117082905.29499-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Nov 2021 08:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51914 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51914@debbugs.gnu.org Received: via spool by 51914-submit@debbugs.gnu.org id=B51914.163713805010346 (code B ref 51914); Wed, 17 Nov 2021 08:35:02 +0000 Received: (at 51914) by debbugs.gnu.org; 17 Nov 2021 08:34:10 +0000 Received: from localhost ([127.0.0.1]:60066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnGOP-0002go-WA for submit@debbugs.gnu.org; Wed, 17 Nov 2021 03:34:10 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:53573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnGON-0002g6-Vb for 51914@debbugs.gnu.org; Wed, 17 Nov 2021 03:34:08 -0500 Received: (Authenticated sender: mail@ambrevar.xyz) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 2147124000A for <51914@debbugs.gnu.org>; Wed, 17 Nov 2021 08:34:00 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 17 Nov 2021 09:33:52 +0100 Message-Id: <20211117083353.31561-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 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 Inputs can be non-packages, for instance (origin ...). sbcl-package->cl-source-package used to fail if such inputs were present in the parent sbcl-* package. * guix/build-system/asdf.scm (package-with-build-system): Fix 'has-from-build-system?' function. --- guix/build-system/asdf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index b4e40ee8c2..538812d620 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -162,7 +162,8 @@ (define (transform-package-name name) name)) (define (has-from-build-system? pkg) - (eq? from-build-system (package-build-system pkg))) + (when (package? pkg) + (eq? from-build-system (package-build-system pkg)))) (define (find-input-package pkg) (let* ((name (package-name pkg))