The package rpms/nodejs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nodejs.git/commit/?id=6b6a25e47e0....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit 970976bb52000d0d1e422a66eb77fa07873854cc
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Sep 27 08:59:50 2017 -0400
Build with bootstrap + bundle libuv for modularity
backport patch for aarch64 debug build
diff --git a/.gitignore b/.gitignore
index 3dea7b0..3a9e10f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@
/node-v8.3.0-stripped.tar.gz
/node-v8.4.0-stripped.tar.gz
/node-v8.5.0-stripped.tar.gz
+/node-v8.6.0-stripped.tar.gz
diff --git a/nodejs.spec b/nodejs.spec
index 2bfdd57..607c86a 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -19,11 +19,11 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 8
-%global nodejs_minor 5
+%global nodejs_minor 6
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 3
+%global nodejs_release 1
# == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h
diff --git a/sources b/sources
index 7590449..7868d60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (node-v8.5.0-stripped.tar.gz) =
3ea2f3d5d407c3d754776543eefc2f0da14d98df3e24718764c1bcfa3ef6c34e1d2a6417455e108e22b0a9abf57d28f4d794f8c455127e2400bbb1deb6138cdc
+SHA512 (node-v8.6.0-stripped.tar.gz) =
d8154d917cc339e5bef115e2e1db2a821f6f1782aa686705e61394e342d1aba5a960bf7a66f1950c929dff15fb49c7955fb2ce6ebf8e972eee2a5a004c832224
commit d54471f55e45e94a25efd345ce15e6ef40a789b5
Author: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Wed Sep 20 13:11:54 2017 +0200
Fix typo
diff --git a/nodejs.spec b/nodejs.spec
index 1726421..2bfdd57 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -121,7 +121,7 @@ BuildRequires: libuv-devel >= 1:1.9.1
Requires: libuv >= 1:1.9.1
%else
Provides: bundled(http-parser) = %{http_parser_version}
-Provides" bundled(libuv) = %{libuv_version}
+Provides: bundled(libuv) = %{libuv_version}
%endif
BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel)
commit 6796d7797baa6512715b8882b3047e7b99093462
Author: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Wed Sep 20 13:10:05 2017 +0200
Bundle libuv, fix aarch64 debug build
diff --git a/0001-Fix-aarch64-debug.patch b/0001-Fix-aarch64-debug.patch
new file mode 100644
index 0000000..00bae49
--- /dev/null
+++ b/0001-Fix-aarch64-debug.patch
@@ -0,0 +1,34 @@
+From 058e4efd61c7c9ab4efd55bd9aa37e2184654050 Mon Sep 17 00:00:00 2001
+From: Zuzana Svetlikova <zsvetlik(a)redhat.com>
+Date: Wed, 20 Sep 2017 13:05:01 +0200
+Subject: [PATCH] Fix aarch64 debug
+
+---
+ deps/v8/src/v8.gyp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/src/v8.gyp b/deps/v8/src/v8.gyp
+index c269f245aa..2ebbd393a9 100644
+--- a/deps/v8/src/v8.gyp
++++ b/deps/v8/src/v8.gyp
+@@ -348,7 +348,7 @@
+ '<(INTERMEDIATE_DIR)/snapshot.cc',
+ ],
+ 'variables': {
+- 'mksnapshot_flags': [],
++ 'mksnapshot_flags': ['--nodebug_code'],
+ 'conditions': [
+ ['v8_random_seed!=0', {
+ 'mksnapshot_flags': ['--random-seed',
'<(v8_random_seed)'],
+@@ -449,7 +449,7 @@
+ '<(mksnapshot_exec)',
+ ],
+ 'variables': {
+- 'mksnapshot_flags': [],
++ 'mksnapshot_flags': ['--nodebug_code'],
+ 'conditions': [
+ ['v8_random_seed!=0', {
+ 'mksnapshot_flags': ['--random-seed',
'<(v8_random_seed)'],
+--
+2.14.1
+
diff --git a/nodejs.spec b/nodejs.spec
index f849b29..1726421 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,6 +1,7 @@
%global with_debug 1
-%{!?_with_bootstrap: %global bootstrap 0}
+# bundle dependencies that are not available as Fedora modules
+%{!?_with_bootstrap: %global bootstrap 1}
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@@ -8,7 +9,7 @@
# build the standard runtime until that gets sorted out.
#
https://github.com/nodejs/node/issues/15395
%ifarch aarch64
-%global with_debug 0
+%global with_debug 1
%endif
# == Node.js Version ==
@@ -22,7 +23,7 @@
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 2
+%global nodejs_release 3
# == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h
@@ -47,6 +48,12 @@
%global http_parser_patch 0
%global http_parser_version
%{http_parser_major}.%{http_parser_minor}.%{http_parser_patch}
+# libuv - from deps/uv/include/uv-version.h
+%global libuv_major 1
+%global libuv_minor 14
+%global libuv_patch 1
+%global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
+
# punycode - from lib/punycode.js
# Note: this was merged into the mainline since 0.6.x
# Note: this will be unmerged in v7 or v8
@@ -98,9 +105,9 @@ Source7: nodejs_native.attr
# Disable running gyp on bundled deps we don't use
Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch
+Patch2: 0001-Fix-aarch64-debug.patch
+
BuildRequires: python2-devel
-BuildRequires: libuv-devel >= 1:1.9.1
-Requires: libuv >= 1:1.9.1
BuildRequires: libicu-devel
BuildRequires: zlib-devel
BuildRequires: gcc >= 4.9.4
@@ -110,8 +117,11 @@ BuildRequires: gcc-c++ >= 4.9.4
BuildRequires: systemtap-sdt-devel
BuildRequires: http-parser-devel >= 2.7.0
Requires: http-parser >= 2.7.0
+BuildRequires: libuv-devel >= 1:1.9.1
+Requires: libuv >= 1:1.9.1
%else
Provides: bundled(http-parser) = %{http_parser_version}
+Provides" bundled(libuv) = %{libuv_version}
%endif
BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel)
@@ -183,13 +193,13 @@ real-time applications that run across distributed devices.
Summary: JavaScript runtime - development headers
Group: Development/Languages
Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
-Requires: libuv-devel%{?_isa}
Requires: openssl-devel%{?_isa}
Requires: zlib-devel%{?_isa}
Requires: nodejs-packaging
%if ! 0%{?bootstrap}
Requires: http-parser-devel%{?_isa}
+Requires: libuv-devel%{?_isa}
%endif
%description devel
@@ -237,9 +247,10 @@ The API documentation for the Node.js JavaScript runtime.
# remove bundled dependencies that we aren't building
%patch1 -p1
rm -rf deps/icu-small \
- deps/uv \
deps/zlib
+%patch2 -p1
+
%build
# build with debugging symbols and add defines from libuv (#892601)
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on
@@ -274,7 +285,6 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' '
')"
./configure --prefix=%{_prefix} \
--shared-openssl \
--shared-zlib \
- --shared-libuv \
--without-dtrace \
--with-intl=system-icu \
--debug-http2 \
@@ -431,6 +441,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules
%{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc
%changelog
+* Wed Sep 20 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - -
+- Build with bootstrap + bundle libuv for modularity
+- backport patch for aarch64 debug build
+
* Wed Sep 13 2017 Stephen Gallagher <sgallagh(a)redhat.com> - -
- Disable debug builds on aarch64 due to
https://github.com/nodejs/node/issues/15395
commit 6b6a25e47e02efc55c1da4ee09bdfc657af1d5b1
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Sep 13 13:11:48 2017 -0400
Disable debug builds on aarch64 due to
https://github.com/nodejs/node/issues/15395
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index 57dd4ee..f849b29 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -4,10 +4,11 @@
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
-# ARM builds currently break on the Debug builds, so we'll just
+# ARM64 builds of 8.5.0 break on the Debug builds, so we'll just
# build the standard runtime until that gets sorted out.
-%ifarch %{arm} aarch64 %{power64}
-%global with_debug 1
+#
https://github.com/nodejs/node/issues/15395
+%ifarch aarch64
+%global with_debug 0
%endif
# == Node.js Version ==
@@ -21,7 +22,7 @@
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 1
+%global nodejs_release 2
# == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h
@@ -430,6 +431,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules
%{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc
%changelog
+* Wed Sep 13 2017 Stephen Gallagher <sgallagh(a)redhat.com> - -
+- Disable debug builds on aarch64 due to
https://github.com/nodejs/node/issues/15395
+
* Tue Sep 12 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.5.0-1
- Update to v8.5.0
-
https://nodejs.org/en/blog/release/v8.5.0/
commit 94903a9c6124566ac6a3f320906094658b9e9e17
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Sep 12 21:03:19 2017 -0400
Update bundled v8 version
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/nodejs.spec b/nodejs.spec
index e603754..57dd4ee 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -27,8 +27,8 @@
# v8 - from deps/v8/include/v8-version.h
%global v8_major 6
%global v8_minor 0
-%global v8_build 286
-%global v8_patch 52
+%global v8_build 287
+%global v8_patch 53
# V8 presently breaks ABI at least every x.y release while never bumping SONAME
%global v8_abi %{v8_major}.%{v8_minor}
%global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch}
commit 45411df80a4395e46912894546f3f255c74994f0
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Sep 12 20:49:13 2017 -0400
Update to v8.5.0
https://nodejs.org/en/blog/release/v8.5.0/
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index 3b9d78e..3dea7b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@
/node-v8.2.1-stripped.tar.gz
/node-v8.3.0-stripped.tar.gz
/node-v8.4.0-stripped.tar.gz
+/node-v8.5.0-stripped.tar.gz
diff --git a/nodejs.spec b/nodejs.spec
index 1f8f34b..e603754 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -17,11 +17,11 @@
# than a Fedora release lifecycle.
%global nodejs_epoch 1
%global nodejs_major 8
-%global nodejs_minor 4
+%global nodejs_minor 5
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 2
+%global nodejs_release 1
# == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h
@@ -430,6 +430,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules
%{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc
%changelog
+* Tue Sep 12 2017 Stephen Gallagher <sgallagh(a)redhat.com> - 1:8.5.0-1
+- Update to v8.5.0
+-
https://nodejs.org/en/blog/release/v8.5.0/
+
* Thu Sep 07 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.4.0-2
- Refactor openssl BR
diff --git a/sources b/sources
index 190d49b..7590449 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (node-v8.4.0-stripped.tar.gz) =
fb49b47427bb25e235c0a179f2d2b8060920eb2ea482ecf361f51b15f3b1e84e6f65b691abcc1e0ec79b99a0fed249e6cf7300ba2096fb526d47912e15a3552c
+SHA512 (node-v8.5.0-stripped.tar.gz) =
3ea2f3d5d407c3d754776543eefc2f0da14d98df3e24718764c1bcfa3ef6c34e1d2a6417455e108e22b0a9abf57d28f4d794f8c455127e2400bbb1deb6138cdc
commit 673f149abf0ce6b400f9010a2866fa3155d042d0
Author: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Fri Sep 8 14:40:09 2017 +0200
Fix openssl version
diff --git a/nodejs.spec b/nodejs.spec
index e2cb40f..1f8f34b 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -113,7 +113,7 @@ Requires: http-parser >= 2.7.0
Provides: bundled(http-parser) = %{http_parser_version}
%endif
-BuildRequires: (openssl-devel >= 1:1.0.2 or compat-openssl10-devel)
+BuildRequires: (openssl-devel <= 1:1.1.0 or compat-openssl10-devel)
# we need the system certificate store when Patch2 is applied
Requires: ca-certificates
commit 5afa09cef4db264217a3f9246e7446b3baa5eee2
Author: Zuzana Svetlikova <zsvetlik(a)redhat.com>
Date: Thu Sep 7 18:06:26 2017 +0200
Refactor openssl BR
diff --git a/nodejs.spec b/nodejs.spec
index c3a7869..e2cb40f 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -21,7 +21,7 @@
%global nodejs_patch 0
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 1
+%global nodejs_release 2
# == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h
@@ -113,15 +113,7 @@ Requires: http-parser >= 2.7.0
Provides: bundled(http-parser) = %{http_parser_version}
%endif
-%if 0%{?epel}
-BuildRequires: openssl-devel >= 1:1.0.1
-%else
-%if 0%{?fedora} > 25
-BuildRequires: compat-openssl10-devel >= 1:1.0.2
-%else
-BuildRequires: openssl-devel >= 1:1.0.2
-%endif
-%endif
+BuildRequires: (openssl-devel >= 1:1.0.2 or compat-openssl10-devel)
# we need the system certificate store when Patch2 is applied
Requires: ca-certificates
@@ -247,12 +239,6 @@ rm -rf deps/icu-small \
deps/uv \
deps/zlib
-%if 0%{?epel}
-%patch2 -p1
-%patch5 -p1
-%endif
-
-
%build
# build with debugging symbols and add defines from libuv (#892601)
# Node's v8 breaks with GCC 6 because of incorrect usage of methods on
@@ -444,6 +430,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules
%{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc
%changelog
+* Thu Sep 07 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.4.0-2
+- Refactor openssl BR
+
* Wed Aug 16 2017 Zuzana Svetlikova <zsvetlik(a)redhat.com> - 1:8.4.0-1
- Update to v8.4.0
-
https://nodejs.org/en/blog/release/v8.4.0/