From patchwork Sun Nov 14 12:58:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34465 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 ED22027BBE3; Sun, 14 Nov 2021 13:00:46 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED 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 5E7DB27BBE1 for ; Sun, 14 Nov 2021 13:00:46 +0000 (GMT) Received: from localhost ([::1]:49208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmF7c-0000St-3D for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:00:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmF76-0000Se-2E for guix-patches@gnu.org; Sun, 14 Nov 2021 08:00:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmF74-0001MC-OR for guix-patches@gnu.org; Sun, 14 Nov 2021 08:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmF74-0004pr-OG for guix-patches@gnu.org; Sun, 14 Nov 2021 08:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 01/11] gnu: node: Avoid duplicating build phases. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689474318483 (code B ref 51838); Sun, 14 Nov 2021 13:00:02 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 12:59:03 +0000 Received: from localhost ([127.0.0.1]:49387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmF67-0004o2-4w for submit@debbugs.gnu.org; Sun, 14 Nov 2021 07:59:03 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:33364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmF65-0004nW-5j for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 07:59:01 -0500 Received: by mail-qt1-f180.google.com with SMTP id n15so13071631qta.0 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 04:59:01 -0800 (PST) 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=j2oH8wkCE8WAna0+WGKhXDeSFWHhrNWtN7zxLH0FIHo=; b=CIH0/GivEKKCGlo3eD0q0Ymu8kJ6mxCkr9UQGab5LmxPEZ61tX/rb8W6kSlgKURi9Z hqQJo7/Is1ChwpQnweiIlBuhu+sZRUlSK+d/XjUSzrz71Q+VrT2LFqyHJ2vklizwW0YM FzBx3Autzk0KeSfb8PxTPC6AHOGk57BZphYp7GB6974dPZEULlPEPMeB3Y42hokoiTZ9 j5OL3heJKq5c01UU+9oi71hsvQ1v66tS1/FlwD0VRnuhuKJPE9X//+/KewYtnvzOUc8U wPikzTAWBwo5fwj1n16Ffvzioftu68QrjaeY4UzAu6FSD5T3UdiPRQf429AIeMjas+I7 ULWA== 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=j2oH8wkCE8WAna0+WGKhXDeSFWHhrNWtN7zxLH0FIHo=; b=lyiPEC0qq0dhfmsWEsHxlmqty0HwP/IQZgZq1eTVhg/rmwDKTnvw0bGGBkunomF8Ah QTyNhWBOqcQgfLtiaXKeNEjuthi9PHCycC3VcDD/zO/D8ov16IoX4EWw1QChnEaT4/Fx 9kboCRSHgdHZI4hqz+rpjEsCvsyp1jh2kaOw72Om8fX4Mmj+DeMjrTYcHauvyeUrbPOO rliQxfBiq3gPLIK/YJPBoECigBRvdZVYYIO71sDWTeSaxYMxELK2clpjUi0Jlmp5n+rW G8nNCF0oNpJyEBu3qFPcoLr7kXvPM4pPPzXHKK+G79pVcSGz7KpWSaek7BuALw9xfY3N aurw== X-Gm-Message-State: AOAM5328yooLjam9P8X5BKBKOL9Xr5EtI+AeFfCQVb3Qp3Sh1Ic/MrT6 0pjaFBGuw6+j1t/KSSwQN7fSBu8luZu8eXcT X-Google-Smtp-Source: ABdhPJxstOYOCo/MHONt0IpQYqkaczpZclBs3RXf68QrI0MXIEutWJyKj/RnQPnQ6Dyb2QiBxxFo3g== X-Received: by 2002:ac8:7d46:: with SMTP id h6mr17578185qtb.379.1636894735231; Sun, 14 Nov 2021 04:58:55 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id p16sm6236063qtx.92.2021.11.14.04.58.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 04:58:55 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 07:58:30 -0500 Message-Id: <20211114125830.45427-1-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211114124151.36743-1-philip@philipmcgrath.com> References: <20211114124151.36743-1-philip@philipmcgrath.com> 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/node.scm (node)[arguments]: Split 'patch-files phase into 'patch-hardcoded-program-references and 'delete-problematic-tests. Adapt 'patch-hardcoded-program-references and 'configure to work unmodified on node-lts, but don't try to share 'delete-problematic-tests, because those details seem to change too much between node versions. (node, node-lts)[inputs]: Use bash-minimal rather than bash. (node-lts)[arguments]: Inherit 'patch-hardcoded-program-references, and 'configure phases from the bootstrap node. Remove the 'patch-files phase, keeping its remaining non-inherited work in a new 'replace-llhttp-sources phase. --- gnu/packages/node.scm | 105 +++++++++++++----------------------------- 1 file changed, 32 insertions(+), 73 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d0ffe8a398..db1658f03d 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021 Pierre Langlois ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,14 +106,22 @@ (define-public node #:test-target "test-ci-js" #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-files + (add-before 'configure 'patch-hardcoded-program-references (lambda* (#:key inputs #:allow-other-keys) + ;; Fix hardcoded /bin/sh references. - (substitute* '("lib/child_process.js" - "lib/internal/v8_prof_polyfill.js" - "test/parallel/test-child-process-spawnsync-shell.js" - "test/parallel/test-stdio-closed.js" - "test/sequential/test-child-process-emfile.js") + (substitute* + (let ((common + '("lib/child_process.js" + "lib/internal/v8_prof_polyfill.js" + "test/parallel/test-child-process-spawnsync-shell.js" + "test/parallel/test-stdio-closed.js" + "test/sequential/test-child-process-emfile.js")) + ;; not in bootstap node: + (sigxfsz "test/parallel/test-fs-write-sigxfsz.js")) + (if (file-exists? sigxfsz) + (cons sigxfsz common) + common)) (("'/bin/sh'") (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"))) @@ -122,7 +131,10 @@ (define-public node "test/parallel/test-child-process-exec-env.js") (("'/usr/bin/env'") (string-append "'" (assoc-ref inputs "coreutils") - "/bin/env'"))) + "/bin/env'"))))) + (add-after 'patch-hardcoded-program-references + 'delete-problematic-tests + (lambda* (#:key inputs #:allow-other-keys) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. @@ -217,9 +229,13 @@ (define-public node (setenv "CXX" ,(cxx-for-target)) (setenv "PKG_CONFIG" ,(pkg-config-for-target)) (apply invoke - (string-append (assoc-ref (or native-inputs inputs) - "python") - "/bin/python") + (let ((python + (string-append (assoc-ref (or native-inputs inputs) + "python") + "/bin/python"))) + (if (file-exists? python) + python + (string-append python "3"))) "configure" flags)))) (add-after 'patch-shebangs 'patch-npm-shebang (lambda* (#:key outputs #:allow-other-keys) @@ -256,7 +272,7 @@ (define-public node (variable "NODE_PATH") (files '("lib/node_modules"))))) (inputs - `(("bash" ,bash) + `(("bash" ,bash-minimal) ("coreutils" ,coreutils) ("c-ares" ,c-ares) ("http-parser" ,http-parser) @@ -711,66 +727,8 @@ (define-public node-lts libuv "/lib:" zlib "/lib" "'],")))))) - (replace 'configure - ;; Node's configure script is actually a python script, so we can't - ;; run it with bash. - (lambda* (#:key outputs (configure-flags '()) native-inputs inputs - #:allow-other-keys) - (let* ((prefix (assoc-ref outputs "out")) - (xflags ,(if (%current-target-system) - `'("--cross-compiling" - ,(string-append - "--dest-cpu=" - (match (%current-target-system) - ((? (cut string-prefix? "arm" <>)) - "arm") - ((? (cut string-prefix? "aarch64" <>)) - "arm64") - ((? (cut string-prefix? "i686" <>)) - "ia32") - ((? (cut string-prefix? "x86_64" <>)) - "x64") - ((? (cut string-prefix? "powerpc64" <>)) - "ppc64") - (_ "unsupported")))) - ''())) - (flags (cons - (string-append "--prefix=" prefix) - (append xflags configure-flags)))) - (format #t "build directory: ~s~%" (getcwd)) - (format #t "configure flags: ~s~%" flags) - ;; Node's configure script expects the CC environment variable to - ;; be set. - (setenv "CC_host" "gcc") - (setenv "CXX_host" "g++") - (setenv "CC" ,(cc-for-target)) - (setenv "CXX" ,(cxx-for-target)) - (setenv "PKG_CONFIG" ,(pkg-config-for-target)) - (apply invoke - (string-append (assoc-ref (or native-inputs inputs) - "python") - "/bin/python3") - "configure" flags)))) - (replace 'patch-files + (replace 'delete-problematic-tests (lambda* (#:key inputs #:allow-other-keys) - ;; Fix hardcoded /bin/sh references. - (substitute* '("lib/child_process.js" - "lib/internal/v8_prof_polyfill.js" - "test/parallel/test-child-process-spawnsync-shell.js" - "test/parallel/test-fs-write-sigxfsz.js" - "test/parallel/test-stdio-closed.js" - "test/sequential/test-child-process-emfile.js") - (("'/bin/sh'") - (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"))) - - ;; Fix hardcoded /usr/bin/env references. - (substitute* '("test/parallel/test-child-process-default-options.js" - "test/parallel/test-child-process-env.js" - "test/parallel/test-child-process-exec-env.js") - (("'/usr/bin/env'") - (string-append "'" (assoc-ref inputs "coreutils") - "/bin/env'"))) - ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. (for-each delete-file @@ -806,8 +764,9 @@ (define-public node-lts ;; TODO: Regenerate certs instead. (for-each delete-file '("test/parallel/test-tls-passphrase.js" - "test/parallel/test-tls-server-verify.js")) - + "test/parallel/test-tls-server-verify.js")))) + (add-after 'delete-problematic-tests 'replace-llhttp-sources + (lambda* (#:key inputs #:allow-other-keys) ;; Replace pre-generated llhttp sources (let ((llhttp (assoc-ref inputs "llhttp"))) (copy-file (string-append llhttp "/src/llhttp.c") @@ -834,7 +793,7 @@ (define-public node-lts ("python" ,python) ("util-linux" ,util-linux))) (inputs - `(("bash" ,bash) + `(("bash" ,bash-minimal) ("coreutils" ,coreutils) ("c-ares" ,c-ares) ("icu4c" ,icu4c-67)