From patchwork Thu Sep 28 20:14:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 54380 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 49E9A27BBEA; Thu, 28 Sep 2023 21:16:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8649227BBE2 for ; Thu, 28 Sep 2023 21:16:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlxQc-00080U-Sf; Thu, 28 Sep 2023 16:16:07 -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 1qlxQL-0007zp-Ua for guix-patches@gnu.org; Thu, 28 Sep 2023 16:15:50 -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 1qlxQL-0000pO-DW for guix-patches@gnu.org; Thu, 28 Sep 2023 16:15:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlxQZ-0006fb-Mc for guix-patches@gnu.org; Thu, 28 Sep 2023 16:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66259] [PATCH 3/4] gnu: sdcc: Embed absolute reference to =?utf-8?b?zrxDc2ltLg==?= Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 20:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66259@debbugs.gnu.org Received: via spool by 66259-submit@debbugs.gnu.org id=B66259.169593216025358 (code B ref 66259); Thu, 28 Sep 2023 20:16:03 +0000 Received: (at 66259) by debbugs.gnu.org; 28 Sep 2023 20:16:00 +0000 Received: from localhost ([127.0.0.1]:54618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxQV-0006aN-U5 for submit@debbugs.gnu.org; Thu, 28 Sep 2023 16:16:00 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:55842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxQK-00061v-7d for 66259@debbugs.gnu.org; Thu, 28 Sep 2023 16:15:48 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 8CB7364089 for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yRfE-lohjOzg for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:58 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 3A9176406C for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:58 +0000 (UTC) From: Simon South Date: Thu, 28 Sep 2023 16:14:47 -0400 Message-ID: <6c9f9a8e070b24cd6afa186ac6376a1adb3db9b8.1695929761.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (sdcc)[arguments]<#:phases>: Add "embed-absolute-ucsim-reference" phase. [inputs]: Add ucsim. --- gnu/packages/embedded.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 630f2b37e0..9202aaf5b6 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1680,9 +1680,18 @@ (define-public sdcc (("debugger/mcs51" line) (string-append line "\n" "TARGETS += sdcc-misc\n" - "PKGS += $(SDCC_MISC)")))))))) + "PKGS += $(SDCC_MISC)"))))) + (add-after 'patch-makefiles 'embed-absolute-ucsim-reference + (lambda _ + ;; Embed in the debugger an absolute reference to the MCS-51 + ;; simulator from Guix's μCsim package to ensure it is always + ;; available. + (substitute* "debugger/mcs51/sdcdb.c" + (("s51") + (string-append #$(this-package-input "ucsim") + "/bin/s51")))))))) (inputs - (list readline)) + (list readline ucsim)) (native-inputs (list bison boost flex python-2 texinfo zlib)) (home-page "https://sdcc.sourceforge.net/")