From patchwork Tue May 3 18:33:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39112 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 0B6B227BBEB; Tue, 3 May 2022 19:38:01 +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=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 C45A527BBEA for ; Tue, 3 May 2022 19:38:00 +0100 (BST) Received: from localhost ([::1]:37936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlxPM-00025g-0d for patchwork@mira.cbaines.net; Tue, 03 May 2022 14:38:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlxMW-0000DO-Dx for guix-patches@gnu.org; Tue, 03 May 2022 14:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47164) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlxMW-0007Bv-4I for guix-patches@gnu.org; Tue, 03 May 2022 14:35:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlxMW-0002nl-2E for guix-patches@gnu.org; Tue, 03 May 2022 14:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH 6/7] gnu: stex: Get machine type dynamically. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 May 2022 18:35:04 +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: Philip McGrath Received: via spool by 55248-submit@debbugs.gnu.org id=B55248.165160289010696 (code B ref 55248); Tue, 03 May 2022 18:35:04 +0000 Received: (at 55248) by debbugs.gnu.org; 3 May 2022 18:34:50 +0000 Received: from localhost ([127.0.0.1]:41053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlxMI-0002mS-GY for submit@debbugs.gnu.org; Tue, 03 May 2022 14:34:50 -0400 Received: from mail-vs1-f45.google.com ([209.85.217.45]:42722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlxMH-0002ls-6Y for 55248@debbugs.gnu.org; Tue, 03 May 2022 14:34:49 -0400 Received: by mail-vs1-f45.google.com with SMTP id i186so17282141vsc.9 for <55248@debbugs.gnu.org>; Tue, 03 May 2022 11:34:49 -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=Qjy7GoVY+8fdHFIxYvj8l085ymqiF47iTCDIlBChsm0=; b=QcX0MI2RjEYBZqe11mhaaeYKABS+nVlRBRtGzOY0CkFfk/eHxiPlCeenOcbvhuNFvw C7vpH4Bga2XheD4K0FxPbIkq9XrafIhRM5CwpYEm1tyyKKDJp91bTmiz7Aey3bAkcrJ5 kZ/zrnLsxNuXkRIcIsz+TRATsD78dJsJ9O9G95IcdiKz8nujYnY18lxXlwLzkbDjyext Mih2T1kh6opeHaDcqmEO8r3JvI88W3mn7bpinhDqsb8XH4MiTfWroRNgly86woluNSWn V1OrJBohSKPQxXSFnZdrkXquyjkK94s/G4onK7KK+4Ks+xiWDTGXJ0mpXnaeeOMQdrP4 zXuA== 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=Qjy7GoVY+8fdHFIxYvj8l085ymqiF47iTCDIlBChsm0=; b=ORNpH7eT2KQPwf+CYIEYYA5rSuAZ9VyrTjkVqObwTSXRC1fM+XW/GoPJdq2M+QeaWE Lhiyu3Kis+3jn4ioXXQ+tzZDdXH30rnHc05yYih9XDp7BdbNczTEN2J5ByztUDxiyGhU kRCMKtkXvTnyx98a/VUYstW6Qe1y/f7ecH69Iqn+e6LSFtD8zjPkDqaYVYG/TPezJmS8 atL27vX1/tSPIa4AYIZgGmjkn7oUEQ7DbYsBJaJvd85vqRdAPMqg5WlljlOXp8H/V+KZ /xONAuAx8H+gPbfFtz7JUJsgBbNCyW5z72j9lDrhqUwQo3yHitUU2xGP33LJ5C5SMnNY cVWQ== X-Gm-Message-State: AOAM531/FivDC7Y4kob8pPOfTCpKXiTnWiiuZcuo+GeCfduWV3ravJtZ PDF2brNKPO5meY4suBrh/4zwN6yGY54Lrr7a X-Google-Smtp-Source: ABdhPJwnrDEuZKnd5BBsBApAFt4X8px7CHqd3x7yL6ZdMvuAohDV/FIxaRH7wnb/uVXxMNoJEykHrg== X-Received: by 2002:a67:e217:0:b0:32c:c30f:e9b0 with SMTP id g23-20020a67e217000000b0032cc30fe9b0mr4984834vsa.26.1651602883684; Tue, 03 May 2022 11:34:43 -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 w1-20020ab07281000000b003626f894dfasm3823144uao.40.2022.05.03.11.34.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 May 2022 11:34:43 -0700 (PDT) From: Philip McGrath Date: Tue, 3 May 2022 14:33:45 -0400 Message-Id: <5375de56eda0ee7c218ddf48da61ea600c0d2589.1651594312.git.philip@philipmcgrath.com> 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 785b6837c1..ea53cf5774 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,12 @@ (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"))) + (write '(machine-type) 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"