From patchwork Mon May 9 06:02:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39175 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 AA8E527BBEA; Mon, 9 May 2022 07:06:30 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 6C45F27BBE9 for ; Mon, 9 May 2022 07:06:30 +0100 (BST) Received: from localhost ([::1]:42854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnwXN-0001ip-HV for patchwork@mira.cbaines.net; Mon, 09 May 2022 02:06:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnwVy-0001h4-Sd for guix-patches@gnu.org; Mon, 09 May 2022 02:05:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnwVy-0004nv-Jl for guix-patches@gnu.org; Mon, 09 May 2022 02:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnwVy-0000x5-F7 for guix-patches@gnu.org; Mon, 09 May 2022 02:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH v3 6/9] gnu: stex: Get machine type dynamically. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 06:05:02 +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.16520762473549 (code B ref 55248); Mon, 09 May 2022 06:05:02 +0000 Received: (at 55248) by debbugs.gnu.org; 9 May 2022 06:04:07 +0000 Received: from localhost ([127.0.0.1]:55713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnwV5-0000v5-Bs for submit@debbugs.gnu.org; Mon, 09 May 2022 02:04:07 -0400 Received: from mail-ua1-f49.google.com ([209.85.222.49]:35606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnwUv-0000tH-IA for 55248@debbugs.gnu.org; Mon, 09 May 2022 02:03:57 -0400 Received: by mail-ua1-f49.google.com with SMTP id x11so5062391uao.2 for <55248@debbugs.gnu.org>; Sun, 08 May 2022 23:03:57 -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=duK2JrSxOlmn3OX26POj1SIPfZ4DYdl6OGgJEbE2luX8FCLpb1ZAP608qy7kdzhb0+ WSre12PIcqaTi/1VXdhU2V63GFnKCPiIAgf7BvLMJVHPTLsw6OEdakKhAOmnhXr43BvP Eoxq8ctX5gh3d4EnVIMHfLYZ1GwMZU7cfHVszbnfQmhqWz5S8dMYT6ThWQRgrk1H9JvC nA8LdeC7L5VZAK63Dmc8RDF8N6VA2xSNSb47Bb0jSNiPuAxjnyuNDsww8kNaa2P9n9Bw 27RhV9i3XfIfFAKHun/92sjomMf9DXXb/56YzZJlpaF5wFv03JzmgHFxc+D1z4cAtfX4 0b4Q== 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=o6T2bpjrsH+yi+iBiumcsFxHTSySk3n4tDVW6mXLr4kpOY67i5cnJd6j4B8NWINP1J Ck/78OZ+BdZLMWCq+uXHuj8+ITPONOWzpzAUh/mt0q3tWSRk+xUZ6kLUtFH0CUbPMVRb +YIFTcMNo4ABpzQFpZvXUGxhlLcXYSImGP5xF1KiVG9IZLqU2hofCwaoip9U0146SD3Z RkSS5+Nxi3EJF0vWPFfuwbVJqTemwIQfONlzTupm03TdM9bYlQTq1SZlH2Q8crBeDkyT czWL1Sea8cc6qZpt31DIG4tpL+Bdjt+03u28JyOS1HAhed8FM+YgPJZPb9Jw6lcfYugh 1YYw== X-Gm-Message-State: AOAM533wrn5AqTPpT4p0BrEn3nfGCtGt3I9cmiHAJyHX69I1axutD5HO YC/8ldKsxr7H4EVj5FutqNepr+x8sVOAk0KC X-Google-Smtp-Source: ABdhPJyJ1bW2dbZc+UEX0S5ICHOCHFTqxc3gK80oWXe3mGngP1j6CYuCsjzVAXgaWp+YNdlas0XElA== X-Received: by 2002:ab0:15ed:0:b0:365:f250:7384 with SMTP id j42-20020ab015ed000000b00365f2507384mr2309472uae.44.1652076232068; Sun, 08 May 2022 23:03:52 -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 e188-20020a1f1ec5000000b00352319fb500sm1273444vke.48.2022.05.08.23.03.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 23:03:51 -0700 (PDT) From: Philip McGrath Date: Mon, 9 May 2022 02:02:47 -0400 Message-Id: <6521decd69c70fe38b056c2dbec10d1a1af0e570.1652075689.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 | 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"