From 5f16cf954c4ba60478a7439b08e699037632a234 Mon Sep 17 00:00:00 2001 From: hht8 Date: Mon, 4 Jan 2021 10:29:03 +0800 Subject: [PATCH] Make AARCH64 compile on 64KB physical pages to fix build error --- ...RCH64-compile-on-64KB-physical-pages.patch | 25 +++++++++++++++++++ nodejs.spec | 9 ++++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 0004-Make-AARCH64-compile-on-64KB-physical-pages.patch diff --git a/0004-Make-AARCH64-compile-on-64KB-physical-pages.patch b/0004-Make-AARCH64-compile-on-64KB-physical-pages.patch new file mode 100644 index 0000000..c276904 --- /dev/null +++ b/0004-Make-AARCH64-compile-on-64KB-physical-pages.patch @@ -0,0 +1,25 @@ +From 8a189060f6e5f969fc331f4531f31c319d654639 Mon Sep 17 00:00:00 2001 +From: hht8 +Date: Mon, 4 Jan 2021 09:14:35 +0800 +Subject: [PATCH] Make AARCH64 compile on 64KB physical pages + +--- + deps/v8/src/base/build_config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deps/v8/src/base/build_config.h b/deps/v8/src/base/build_config.h +index f430082..098e36f 100644 +--- a/deps/v8/src/base/build_config.h ++++ b/deps/v8/src/base/build_config.h +@@ -202,7 +202,7 @@ + #endif + + // Number of bits to represent the page size for paged spaces. +-#if defined(V8_TARGET_ARCH_PPC) || defined(V8_TARGET_ARCH_PPC64) ++#if defined(V8_TARGET_ARCH_PPC) || defined(V8_TARGET_ARCH_PPC64) || defined(V8_TARGET_ARCH_ARM64) + // PPC has large (64KB) physical pages. + const int kPageSizeBits = 19; + #else +-- +2.23.0 + diff --git a/nodejs.spec b/nodejs.spec index f311c71..2f21052 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,5 +1,5 @@ %bcond_with bootstrap -%global baserelease 1 +%global baserelease 2 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %global nodejs_epoch 1 %global nodejs_major 12 @@ -67,7 +67,7 @@ Name: nodejs Epoch: %{nodejs_epoch} Version: %{nodejs_version} -Release: %{nodejs_release}%{?dist} +Release: %{nodejs_release} Summary: JavaScript runtime License: MIT and ASL 2.0 and ISC and BSD Group: Development/Languages @@ -84,7 +84,7 @@ Patch0002: 0002-Install-both-binaries-and-use-libdir.patch %ifarch aarch64 Patch0003: 0003-Modify-openEuler-aarch64-v8_os_page_size-to-64.patch %endif - +Patch0004: 0004-Make-AARCH64-compile-on-64KB-physical-pages.patch BuildRequires: python3-devel BuildRequires: zlib-devel BuildRequires: brotli-devel @@ -486,6 +486,9 @@ end %{_pkgdocdir}/npm/docs %changelog +* Mon Jan 04 2020 huanghaitao - 1:12.18.4-2 +- Make AARCH64 compile on 64KB physical pages to fix build error + * Wed Nov 18 2020 lingsheng - 1:12.18.4-1 - Update to 12.18.4 -- Gitee