From patchwork Thu Sep 30 22:56:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 33476 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 73E3127BBE3; Thu, 30 Sep 2021 23:59:10 +0100 (BST) 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 CB64927BBE1 for ; Thu, 30 Sep 2021 23:59:09 +0100 (BST) Received: from localhost ([::1]:37224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW51A-0008Qv-Ln for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 18:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mW514-0008QZ-80 for guix-patches@gnu.org; Thu, 30 Sep 2021 18:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42740) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mW514-0000k7-0u for guix-patches@gnu.org; Thu, 30 Sep 2021 18:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mW513-0000d4-WF for guix-patches@gnu.org; Thu, 30 Sep 2021 18:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 1/3] gnu: node: Avoid duplicating build phases. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 22:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois , Maxime Devos , Philip McGrath Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.16330427412411 (code B ref 49946); Thu, 30 Sep 2021 22:59:01 +0000 Received: (at 49946) by debbugs.gnu.org; 30 Sep 2021 22:59:01 +0000 Received: from localhost ([127.0.0.1]:54286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mW512-0000cp-Er for submit@debbugs.gnu.org; Thu, 30 Sep 2021 18:59:00 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:44009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mW510-0000cb-7u for 49946@debbugs.gnu.org; Thu, 30 Sep 2021 18:58:59 -0400 Received: by mail-qt1-f180.google.com with SMTP id a13so7290898qtw.10 for <49946@debbugs.gnu.org>; Thu, 30 Sep 2021 15:58:58 -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=MycQHhB6Tae9cF8f5+uyJE1zoQYz4DNSrnHhFvr65MM=; b=VJfoDUPu1FCcpHKOLexzvMpa4/MPPWQPjwkVe3cVElLjosZqT4dymttirkgiUUdnSk WyJZHJ/2nNPv3CL20A9P7kNsfZNR+5p8ALzcFlDoWQ/ydjiZo6HhyDovmePUAMLa0DVj 0ePjU7T/ohXYl4cfJ8wJlzFLtT6BMd1devyPLTdfZ9gR97kTKOesjlt1DdLDAZ6c9Ive DXBxuz/He/OB7i4r5iVGLA8/PG/UAcYUv2JAv52/tjG6U5fFxPwPl5CbZTHNdvmLk3u6 NYQSulqb0TKKqcc127KYa4TQ43e+Ej1K2YKo0KkfY52q+5yr0DRUEVw+qZm3cGOlpuWM lnPw== 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=MycQHhB6Tae9cF8f5+uyJE1zoQYz4DNSrnHhFvr65MM=; b=ir0uwtsga0ZIQGJMBzQ7IwYfkLqfkFPtC2tWJMT6UcT3i6DsCfeKf+MC35WlPshEkM LyTDRcLHQlhqHCQY2sLFtER07oN3afXVseYpmiyj2Pg8PtfBW4NNpAs1/6rx4r5OSPZL ofbF/eArczKOs+8HvXbbXCNT1C1wriHlOVtUNVNZzxsCwz42mSfiDirdIQwpG8sFiod8 wKXEVLsUhw0Q6r+gG4QDsgU89mIQW8Fppap6fqoJKqG1LLQQ5QGxe5dDTQx6WH4elGdY +0bH/2x4KNADz2UJXQuoWDimnEPM2SoNDVYHbGV4xkKkLicY3/Xl4SeifN4LSgeQrBQt Ch3Q== X-Gm-Message-State: AOAM53018PtxfUE/F1mui1dcsReIRubiUiymsdwkW39PrOArQF8C4o5Q YyVig+bqoloNbrom5Fw4Z3aW8xg5Xf1fvM+f X-Google-Smtp-Source: ABdhPJydDbz9Y/Iz9hMZbuyaDyxQx52UxsJaoRI6/sWGmsUz/QgrUZBnPUNYjuInn8TzjhFN6ovExA== X-Received: by 2002:aed:2794:: with SMTP id a20mr9432174qtd.243.1633042732508; Thu, 30 Sep 2021 15:58:52 -0700 (PDT) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id z19sm2268817qts.96.2021.09.30.15.58.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Sep 2021 15:58:52 -0700 (PDT) From: Philip McGrath Date: Thu, 30 Sep 2021 18:56:10 -0400 Message-Id: <20210930225611.2143194-2-philip@philipmcgrath.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210930225611.2143194-1-philip@philipmcgrath.com> References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@philipmcgrath.com> <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> <20210808233354.6745-8-pierre.langlois@gmx.com> <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@telenet.be> <87o88gq5p5.fsf@gmx.com> <20210930225611.2143194-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 those phases and 'configure to work unmodified on node-lts. (node, node-lts)[inputs]: Use bash-minimal rather than bash. (node-lts)[arguments]: Inherit 'patch-hardcoded-program-references, 'delete-problemating-tests, 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 | 150 +++++++++++------------------------------- 1 file changed, 39 insertions(+), 111 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index f8ac95884c..34c2bfa9d4 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 @@ #: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,18 +131,28 @@ "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) + (define (delete-file-if-exists pth) + (when (file-exists? pth) + (delete-file pth))) ;; 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 + (for-each delete-file-if-exists '("test/parallel/test-cluster-master-error.js" "test/parallel/test-cluster-master-kill.js" ;; See also . + ;; (no longer exists in node-lts) "test/sequential/test-performance.js")) - ;; This requires a DNS resolver. - (delete-file "test/parallel/test-dns.js") + ;; These require a DNS resolver. + (for-each delete-file-if-exists + '("test/parallel/test-dns.js" + ;; not in the bootstrap node: + "test/parallel/test-dns-lookupService-promises.js")) + ;; FIXME: This test fails randomly: ;; https://github.com/nodejs/node/issues/31213 @@ -217,9 +236,13 @@ (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 +279,7 @@ (variable "NODE_PATH") (files '("lib/node_modules"))))) (inputs - `(("bash" ,bash) + `(("bash" ,bash-minimal) ("coreutils" ,coreutils) ("c-ares" ,c-ares) ("http-parser" ,http-parser) @@ -711,103 +734,8 @@ source files.") 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 + (add-after 'delete-problematic-tests 'replace-llhttp-sources (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 - '("test/parallel/test-cluster-master-error.js" - "test/parallel/test-cluster-master-kill.js")) - - ;; These require a DNS resolver. - (for-each delete-file - '("test/parallel/test-dns.js" - "test/parallel/test-dns-lookupService-promises.js")) - - ;; FIXME: This test fails randomly: - ;; https://github.com/nodejs/node/issues/31213 - (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") - - ;; FIXME: These tests fail on armhf-linux: - ;; https://github.com/nodejs/node/issues/31970 - ,@(if (target-arm32?) - '((for-each delete-file - '("test/parallel/test-zlib.js" - "test/parallel/test-zlib-brotli.js" - "test/parallel/test-zlib-brotli-flush.js" - "test/parallel/test-zlib-brotli-from-brotli.js" - "test/parallel/test-zlib-brotli-from-string.js" - "test/parallel/test-zlib-convenience-methods.js" - "test/parallel/test-zlib-random-byte-pipes.js" - "test/parallel/test-zlib-write-after-flush.js"))) - '()) - - ;; These tests have an expiry date: they depend on the validity of - ;; TLS certificates that are bundled with the source. We want this - ;; package to be reproducible forever, so remove those. - ;; TODO: Regenerate certs instead. - (for-each delete-file - '("test/parallel/test-tls-passphrase.js" - "test/parallel/test-tls-server-verify.js")) - ;; Replace pre-generated llhttp sources (let ((llhttp (assoc-ref inputs "llhttp"))) (copy-file (string-append llhttp "/src/llhttp.c") @@ -834,7 +762,7 @@ source files.") ("python" ,python) ("util-linux" ,util-linux))) (inputs - `(("bash" ,bash) + `(("bash" ,bash-minimal) ("coreutils" ,coreutils) ("c-ares" ,c-ares) ("icu4c" ,icu4c-67)