From patchwork Sat Jun 5 09:38:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 29938 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 5EA9B27BC78; Sat, 5 Jun 2021 10:39: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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 711EF27BC81 for ; Sat, 5 Jun 2021 10:39:09 +0100 (BST) Received: from localhost ([::1]:38242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lpSlo-0004hP-Fw for patchwork@mira.cbaines.net; Sat, 05 Jun 2021 05:39:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpSlj-0004hB-B9 for guix-patches@gnu.org; Sat, 05 Jun 2021 05:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lpSli-0001dP-JX for guix-patches@gnu.org; Sat, 05 Jun 2021 05:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lpSli-0002HB-Hz for guix-patches@gnu.org; Sat, 05 Jun 2021 05:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48845] [PATCH core-updates] gnu: node: Fix build. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Jun 2021 09:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48845 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48845@debbugs.gnu.org Cc: Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16228859348734 (code B ref -1); Sat, 05 Jun 2021 09:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jun 2021 09:38:54 +0000 Received: from localhost ([127.0.0.1]:48326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpSlZ-0002Gn-PX for submit@debbugs.gnu.org; Sat, 05 Jun 2021 05:38:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:53974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lpSlY-0002Gg-E1 for submit@debbugs.gnu.org; Sat, 05 Jun 2021 05:38:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpSlX-0004gS-R3 for guix-patches@gnu.org; Sat, 05 Jun 2021 05:38:51 -0400 Received: from mout.web.de ([217.72.192.78]:51795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lpSlR-0001Tm-0h for guix-patches@gnu.org; Sat, 05 Jun 2021 05:38:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1622885921; bh=aPsf5U7sg+dipIgx8WXApWBxtDsvbxjvpsKTlgnGP1Y=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=h8tw8M7UfVszabUTqyUEVzyT+l5brZv6RBSC1txzHd4VlpfpCFPIlg0jnYg+v8yp3 NfVNwbkBK7hHijLTF81Z/PcbaVd6lzT0ZCs8TFo7TD6hG4gUZJpAF2uR7274x84AXS LByR4O2r00gtrI/YrEhBW3vETdQfk2Rr7zTqh4/Y= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from 3700X.fritz.box ([88.152.185.61]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0LfRzh-1l0n4C0zBR-00p2nG; Sat, 05 Jun 2021 11:38:41 +0200 From: Jonathan Brielmaier Date: Sat, 5 Jun 2021 11:38:29 +0200 Message-Id: <20210605093829.20999-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:zYX1abDy65VhtEejJG7r8AVx003tCxZiMtjLSwyzsfmKdZB5/i6 sI/9STl5VnoZDsIKtxEIBOWDxhG+JWtgJVjRYVbNAAuzFKtOwGmrG0Ak1qzezj7Sxxo4H8J pvNtF97b1z9Y1gzQ8UFn8kgz9QhbaUMafurmHhx8X72P0Nu/9VAzDanmmwYUqSUX9ViDzFR Y9qkuCyq+IlWxcLjvIeNw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Z+YcwyiY/+0=:z+IB7VIjavvBf19jvvn55k Lbzn9tdDwBMj+AhLFHzGcG/lPDjs3oBNZe14LGqZC29PFkIOY1HGO+YayjZ4AQxMTj1vMfiG8 8SqciQJe2SOHpe1HQ/L21IhqgNc2XCUK7KJLHueGCk6yRblWjR6s7Ugl8coF0wRMbp+C0aucg clwWeNbZm8oKtQU4XF4HE07kPVrdVY8xMGSARRxrSPXm8m7qf1W7w/tP2O/tsy9w+tEProiLR I27Bks5fSgkIg3FoSQHD9NgIZf+6gFpuwnRXgyz/PwN3AqeAZXJYmkBwxCmC1enqoCZXynlFg R4/nNFijfjPeTrLEOJMssdXL9wMH9nyUiTshWLD0F5F0loSz08PQoKyRaqjWpJ107KeNK0RIP ns0aAoOmv0WieoVOQN2emyCehX7ABk8OCb1iN3t+6m3pFsPaRIdzTgmvgxKhUE6SxrB15CKCK AhEFGcrl40+FEb2BNziJV4D6nPVOTJU1YUuYUX5bm7MAA5JEbeA3WjfUZOv0OOhjQmJsXVfn8 nqtfFJpjY4TB5f/klYmrqErGDJgadeGi6bCz4x52Lkmx6FTUl3AnKmSsSyIoAtYUF0uKhpIcD 220zw9TD41DaYdw4rnbdVTeh0JtkzdTJYJTQ3shrW1yXpUU8fZ5fDONo9AXUL53K6g+346yRl CWOgj6rGb5k2DTnNI5nDsoLWC9MeJai1M9vtAX9MaM66ZdBm3st3qYdzq7TrVuK0TIH+h5ixb qeMO7Er8skhk0F4CNDZXjes4iDo/pNCHwQrjOyNPLvo3/i3QahRfsozNXX7N6mKAAF69L1NDC yq28eku/7WZwDiGoRioPO1PGPEn4N4R0jAIdFCapeur6d0Xhgychj0R9+ZRkP708CJbPBLGdS /n6v5SGLBegWQL06Yhiak7CVIRnYABmc5Q1L74uTidNlEsRKnur/1CmOtOIXVDliTo/qNiJ5J 19CW9iSWSZilINoPf5UWlXkwN0eSUtPH5qIjqPaW8mjxg/XMBYm5HF8gyjd1VCZ4uwo7R+DiE 15+ouZLps9Y3RCWKNvEPzR6da0qIGD+6LCeYuHiAb02urin793XsdF2AMdyk1+W/02R1PvP8t NS6mHbRq9AEQuaPNkxCwYodvQdhXpzqXkW+mJvjHypwm5Cy/cHKu6rRrQ== Received-SPF: pass client-ip=217.72.192.78; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Newer icu versions do not define and export FALSE anymore, thus leading to a build error. * gnu/packages/patches/node-10.24-fix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/node.scm (source): Use patch. --- gnu/local.mk | 1 + gnu/packages/node.scm | 1 + .../patches/node-10.24-fix-build.patch | 86 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 gnu/packages/patches/node-10.24-fix-build.patch -- 2.31.1 diff --git a/gnu/local.mk b/gnu/local.mk index 1e8dab8989..b0707dc92c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1441,6 +1441,7 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \ + %D%/packages/patches/node-10.24-fix-build.patch \ %D%/packages/patches/nsis-env-passthru.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 4e80dd4d4e..1d94ec54c5 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -61,6 +61,7 @@ (sha256 (base32 "1k1srdis23782hnd1ymgczs78x9gqhv77v0am7yb54gqcspp70hm")) + (patches (search-patches "node-10.24-fix-build.patch")) (modules '((guix build utils))) (snippet `(begin diff --git a/gnu/packages/patches/node-10.24-fix-build.patch b/gnu/packages/patches/node-10.24-fix-build.patch new file mode 100644 index 0000000000..ef255c1016 --- /dev/null +++ b/gnu/packages/patches/node-10.24-fix-build.patch @@ -0,0 +1,86 @@ +Taken from openSUSE: +https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs10 + +Author: Callum Farmer +Date: Mon Dec 21 20:10:03 UTC 2020 +Subject: ICU68 no longer defines TRUE and FALSE +=============================================================== +--- a/deps/v8/src/objects/intl-objects.cc ++++ b/deps/v8/src/objects/intl-objects.cc +@@ -243,7 +243,7 @@ + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -422,7 +422,7 @@ + char result[ULOC_FULLNAME_CAPACITY]; + UErrorCode status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -657,7 +657,7 @@ + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -796,7 +796,7 @@ + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +--- a/deps/v8/src/runtime/runtime-intl.cc ++++ b/deps/v8/src/runtime/runtime-intl.cc +@@ -85,7 +85,7 @@ + char result[ULOC_FULLNAME_CAPACITY]; + + // Force strict BCP47 rules. +- uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error); ++ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, true, &error); + + if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) { + return *factory->NewStringFromAsciiChecked(kInvalidTag); +@@ -132,7 +132,7 @@ + + error = U_ZERO_ERROR; + // No need to force strict BCP47 rules. +- uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error); ++ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, false, &error); + if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) { + // This shouldn't happen, but lets not break the user. + continue; +@@ -164,7 +164,7 @@ + char result[ULOC_FULLNAME_CAPACITY]; + UErrorCode status = U_ZERO_ERROR; + uloc_toLanguageTag(default_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + return *factory->NewStringFromAsciiChecked(result); + } +@@ -399,9 +399,9 @@ + std::unique_ptr sap1; + std::unique_ptr sap2; + icu::UnicodeString string_val1( +- FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); ++ false, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); + icu::UnicodeString string_val2( +- FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); ++ false, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); + result = collator->compare(string_val1, string_val2, status); + } + if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();