From patchwork Sun May 8 20:07:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39165 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 BEFAB27BBEA; Sun, 8 May 2022 21:35:57 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 36DD927BBE9 for ; Sun, 8 May 2022 21:35:57 +0100 (BST) Received: from localhost ([::1]:46482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnndE-0003dd-CH for patchwork@mira.cbaines.net; Sun, 08 May 2022 16:35:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnnED-0003pE-Pr for guix-patches@gnu.org; Sun, 08 May 2022 16:10:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33157) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnnED-0000Fb-GB for guix-patches@gnu.org; Sun, 08 May 2022 16:10:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnnED-0002Nl-Ax for guix-patches@gnu.org; Sun, 08 May 2022 16:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH v2 6/9] gnu: stex: Get machine type dynamically. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 May 2022 20:10:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55248 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55248@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxime Devos , Philip McGrath , Liliana Marie Prikler Received: via spool by 55248-submit@debbugs.gnu.org id=B55248.16520405859050 (code B ref 55248); Sun, 08 May 2022 20:10:05 +0000 Received: (at 55248) by debbugs.gnu.org; 8 May 2022 20:09:44 +0000 Received: from localhost ([127.0.0.1]:55274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnnDs-0002Lt-Lb for submit@debbugs.gnu.org; Sun, 08 May 2022 16:09:44 -0400 Received: from mail-vk1-f172.google.com ([209.85.221.172]:42815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnnDr-0002LA-K4 for 55248@debbugs.gnu.org; Sun, 08 May 2022 16:09:43 -0400 Received: by mail-vk1-f172.google.com with SMTP id e144so5992837vke.9 for <55248@debbugs.gnu.org>; Sun, 08 May 2022 13:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wfcAH5XAdwVPDZfDmFM08aox4jzMZXPVfAuJLvSM8WE=; b=i3EpgLDQ1oSSTsnyZwYyRhsw5aghbnAuMSB2inWnFs0xFFTVVxjhiY9h4RGJuI9tSZ eXidhHWPtgw8dfsuybOLeNENstwWlt5PekfrKTxrYwkghzVs1zYflzn38sH8jAoYMkw7 /XtKVvvl5hQE2WTIa0NwIvQ2AYL04oDS4068KVrWA78KTdHgpno5TpBCgMTD0ASIYqmt PBCp0ptyPm0cfv+30miWzH0j7A3Jo/3WonNkV2u/dF0Rc9IUjzgp7b3ph9Ob2U8deLnx AH2T0UjQONevl8a+wuq12HGyOgEC53ewehJQkVUiKx6y7BkfbthhbV+DbxogyJVpctyD K+Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wfcAH5XAdwVPDZfDmFM08aox4jzMZXPVfAuJLvSM8WE=; b=OtHyylbAeWwHHVDkQbPEYttcqSJqju4hgwmRkox7JZyqM1pdPfxz8aGnax2sURmDcA /9cjmtU3RUlH/3N8njHpVLWSWOkfOuXZ0PhWw1e4lptzPaVkdbNgXQb0sYXW5NLDdycA DLPlxSBj5lv4t40juE0yFlwHNP6Lzafggsydoz7tS4Fodh1wfMZD8XxuwFhAp55BhCpF M1RKHPOk8pNYrM0EuEP+G0i3Hrjw/ESxIzuHduImNQXHV7Ufo0bXQ0IlD6Tah8BFkCkF tIZaqJUkD23I1c94UqdNopJBdXf4WGL30QsTJ62wz1YJiRYyXMRpAGCBahN7QiaymgH4 y4bA== X-Gm-Message-State: AOAM530JNvVdauG7t0vz64tfv6y4eOJDTC1gmOCRaPe+9hpH5S+kfgVl f0ncJ2lsB+by24VxuYyXZCxuWIBHa5ECWZJV X-Google-Smtp-Source: ABdhPJyXsWq2bezperGhksZfNPB3dNcTC11D/Ofnu3bKrdY27JVq0Z+MgRyGBksryWUcjLEtjbbj+w== X-Received: by 2002:a05:6122:e57:b0:351:f3a5:93f1 with SMTP id bj23-20020a0561220e5700b00351f3a593f1mr6758126vkb.33.1652040578156; Sun, 08 May 2022 13:09:38 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id f190-20020a1fe8c7000000b0034e6f1fd063sm1584661vkh.45.2022.05.08.13.09.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 13:09:37 -0700 (PDT) From: Philip McGrath Date: Sun, 8 May 2022 16:07:49 -0400 Message-Id: X-Mailer: git-send-email 2.32.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/chez.scm (stex)[arguments]: Run 'scheme' to determine the machine type. --- gnu/packages/chez.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 785b6837c1..dd485d37e1 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -602,6 +602,10 @@ (define-public stex-bootstrap ("src" "lib/stex/") ("Mf-stex" "lib/stex/") ("Makefile.template" "lib/stex/")) + #:modules + '((guix build copy-build-system) + (guix build utils) + (ice-9 popen)) #:phases #~(modify-phases %standard-phases (add-before 'install 'patch-sources @@ -633,8 +637,14 @@ (define-public stex-bootstrap (define makefile (string-append (getcwd) "/Makefile")) (define machine - #$(and=> (nix-system->chez-machine) - chez-machine->threaded)) + (let ((pipe (open-pipe* OPEN_BOTH scheme "-q"))) + ;; try to not be wrong for cross-compilation + ;; (avoid #% reader abbreviation for Guile) + (write '(($primitive $target-machine)) pipe) + (force-output pipe) + (let ((sym (read pipe))) + (close-pipe pipe) + (symbol->string sym)))) (with-directory-excursion (search-input-directory outputs "/lib/stex") (invoke "make"