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=6c9d2762c91992....
Change: -%ifarch %{power64} s390x
Thanks.
Full change: ============
commit 420fac3b3e5087f1762ec4d8510d497ba34a12e2 Merge: 5f5e0d6 c720837 Author: Stephen Gallagher sgallagh@redhat.com Date: Fri Jun 14 08:03:55 2019 -0400
Merge branch '12'
commit c720837b1e69ea0e4bc5db24e8f9c271550df66b Author: Stephen Gallagher sgallagh@redhat.com Date: Tue Jun 4 14:55:08 2019 -0400
Update to 12.4.0
https://nodejs.org/en/blog/release/v12.4.0/
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index ab9e3c3..5de6457 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From f03434acfdb20c85a8e075d71e8b51417dca316a Mon Sep 17 00:00:00 2001 +From 684bbd3b112afbb575f971ea23a03d3d228922f7 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova zsvetlik@redhat.com Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH 1/3] Disable running gyp on shared deps diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch index 9759700..6266f5d 100644 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -1,4 +1,4 @@ -From a7e02e98e41a9f6d20aea653368080ae2a2970c7 Mon Sep 17 00:00:00 2001 +From 162762fc882d56e48283bd6393242ec613bf74c9 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher sgallagh@redhat.com Date: Tue, 1 May 2018 08:05:30 -0400 Subject: [PATCH 2/3] Suppress NPM message to run global update diff --git a/0003-Install-both-binaries-and-use-libdir.patch b/0003-Install-both-binaries-and-use-libdir.patch index 6b87dcd..3b7d286 100644 --- a/0003-Install-both-binaries-and-use-libdir.patch +++ b/0003-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From e690915a96b568f6550563491a346aacd8b717a5 Mon Sep 17 00:00:00 2001 +From a3e5296fcb14cf3e00f31864f305fb40720e8718 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade quantum.analyst@gmail.com Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 3/3] Install both binaries and use libdir. diff --git a/nodejs.spec b/nodejs.spec index dbee522..dc3727f 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -12,8 +12,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 12 -%global nodejs_minor 3 -%global nodejs_patch 1 +%global nodejs_minor 4 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 72 @@ -578,6 +578,10 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Tue Jun 04 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.4.0-1 +- Update to 12.4.0 +- https://nodejs.org/en/blog/release/v12.4.0/ + * Fri May 24 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.3.1-1 - Update to 12.3.1 - https://nodejs.org/en/blog/release/v12.3.1/ diff --git a/sources b/sources index c254739..2c1ee89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v12.3.1-stripped.tar.gz) = 405b498b81aa9e8e2d9e6da7b8784a30691abed070b2a1bc333b312dac70488e30d87a1b914a4a63cc50b7d7786794fa4327aa236a6d4f2808ee639f2bf5555a +SHA512 (node-v12.4.0-stripped.tar.gz) = 71619c7d83d9ad7350d0fb6b7389646baa15a7b83b86fed34443f4228ef8e3d8e3d7186364e8da4eaacc743a6d4a2df68556bd8ccd0c12f79114948e0f8f7c76
commit 11b4e1cf843b1de47a26951c38a8e526c50e14b3 Author: Stephen Gallagher sgallagh@redhat.com Date: Sat May 25 09:07:39 2019 -0400
Update to 12.3.1
https://nodejs.org/en/blog/release/v12.3.1/ https://nodejs.org/en/blog/release/v12.3.0/
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index 163f11a..ab9e3c3 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From 716c544b0272c89458ed168f3459f873be2f3035 Mon Sep 17 00:00:00 2001 +From f03434acfdb20c85a8e075d71e8b51417dca316a Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova zsvetlik@redhat.com Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH 1/3] Disable running gyp on shared deps @@ -8,10 +8,10 @@ Subject: [PATCH 1/3] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile -index d41bf1601fb5990ae70e0e13fb105677ef8f9b86..4d9b363c7c0eeb83f34cedf2266e939d4ad140e7 100644 +index 5834df883b0c232d2c9187f20e61f35dff4f6cef..ba3cacad0382dc17c4a911ea0c0bb39ced96c650 100644 --- a/Makefile +++ b/Makefile -@@ -114,11 +114,11 @@ with-code-cache: +@@ -139,11 +139,11 @@ with-code-cache: .PHONY: test-code-cache test-code-cache: with-code-cache echo "'test-code-cache' target is a noop" diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch index 7081cde..9759700 100644 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -1,4 +1,4 @@ -From f60c5f106a993adee0f66e44f70a1fee562108e0 Mon Sep 17 00:00:00 2001 +From a7e02e98e41a9f6d20aea653368080ae2a2970c7 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher sgallagh@redhat.com Date: Tue, 1 May 2018 08:05:30 -0400 Subject: [PATCH 2/3] Suppress NPM message to run global update diff --git a/0003-Install-both-binaries-and-use-libdir.patch b/0003-Install-both-binaries-and-use-libdir.patch index 28b329b..6b87dcd 100644 --- a/0003-Install-both-binaries-and-use-libdir.patch +++ b/0003-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From 6be87e48c3b907dfb4c75b7f415b5107189799f0 Mon Sep 17 00:00:00 2001 +From e690915a96b568f6550563491a346aacd8b717a5 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade quantum.analyst@gmail.com Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 3/3] Install both binaries and use libdir. @@ -13,7 +13,7 @@ Signed-off-by: Elliott Sales de Andrade quantum.analyst@gmail.com 2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/configure.py b/configure.py -index 1dd6da6d2b997a3fea602c7ad4ab6ce4197bfc18..b0ae741588fa91cb4a0f6bd483ae0c6469cbc114 100755 +index 15ea5687cf1cd8e4ebe449ea2fc39eea95fb29b6..a738e300d6098bef4975930422b3fa55b3f5421d 100755 --- a/configure.py +++ b/configure.py @@ -534,10 +534,16 @@ parser.add_option('--shared', diff --git a/nodejs.spec b/nodejs.spec index 25f2109..dbee522 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -12,8 +12,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 12 -%global nodejs_minor 2 -%global nodejs_patch 0 +%global nodejs_minor 3 +%global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 72 @@ -27,7 +27,7 @@ %global v8_major 7 %global v8_minor 4 %global v8_build 288 -%global v8_patch 21 +%global v8_patch 27 # 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} @@ -53,8 +53,8 @@
# libuv - from deps/uv/include/uv/version.h %global libuv_major 1 -%global libuv_minor 28 -%global libuv_patch 0 +%global libuv_minor 29 +%global libuv_patch 1 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
# nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -578,6 +578,11 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Fri May 24 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.3.1-1 +- Update to 12.3.1 +- https://nodejs.org/en/blog/release/v12.3.1/ +- https://nodejs.org/en/blog/release/v12.3.0/ + * Wed May 15 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.2.0-1 - Update to 12.2.0 - https://nodejs.org/en/blog/release/v12.2.0/ diff --git a/sources b/sources index 7e5b0fb..c254739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v12.2.0-stripped.tar.gz) = 668b7777e7c369c5eafb741bf9414ede1f30417cec69d82ec3539af0aff42315ece98e84a183044750802d5cf9283498d5783459fb316741a6aedf6f2a1b4f31 +SHA512 (node-v12.3.1-stripped.tar.gz) = 405b498b81aa9e8e2d9e6da7b8784a30691abed070b2a1bc333b312dac70488e30d87a1b914a4a63cc50b7d7786794fa4327aa236a6d4f2808ee639f2bf5555a
commit 61ea09b3c220b5218d7d0dd25df6890be8332544 Author: Stephen Gallagher sgallagh@redhat.com Date: Wed May 15 20:01:54 2019 -0400
Update to 12.2.0
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/nodejs.spec b/nodejs.spec index 48fe77c..25f2109 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -12,7 +12,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 12 -%global nodejs_minor 1 +%global nodejs_minor 2 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h @@ -48,7 +48,7 @@ # llhttp - from deps/llhttp/include/llhttp.h %global llhttp_major 1 %global llhttp_minor 1 -%global llhttp_patch 1 +%global llhttp_patch 3 %global llhttp_version %{llhttp_major}.%{llhttp_minor}.%{llhttp_patch}
# libuv - from deps/uv/include/uv/version.h @@ -578,6 +578,10 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Wed May 15 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.2.0-1 +- Update to 12.2.0 +- https://nodejs.org/en/blog/release/v12.2.0/ + * Tue Apr 30 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.1.0-1 - Update to 12.1.0 - https://nodejs.org/en/blog/release/v12.1.0/ diff --git a/sources b/sources index 1e6ee1d..7e5b0fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v12.1.0-stripped.tar.gz) = 367111600786d57291725e0452f532d7c8c6bfe72259b654fc2518323cb7c49576fe8678de69b559b93cf7a03ae2a2fe4f116a43bba740b2d2e1df5e49582cae +SHA512 (node-v12.2.0-stripped.tar.gz) = 668b7777e7c369c5eafb741bf9414ede1f30417cec69d82ec3539af0aff42315ece98e84a183044750802d5cf9283498d5783459fb316741a6aedf6f2a1b4f31
commit a724e428054448646aeaf04ef101cd770e73398d Author: Stephen Gallagher sgallagh@redhat.com Date: Tue Apr 30 08:51:56 2019 -0400
Update to 12.1.0
https://nodejs.org/en/blog/release/v12.1.0/
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index 927de9f..163f11a 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,4 +1,4 @@ -From be67711060761dcb520dc538582bc497c978a211 Mon Sep 17 00:00:00 2001 +From 716c544b0272c89458ed168f3459f873be2f3035 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova zsvetlik@redhat.com Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH 1/3] Disable running gyp on shared deps @@ -8,7 +8,7 @@ Subject: [PATCH 1/3] Disable running gyp on shared deps 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile -index d04aac3515a1812d120555297f2b340baaea58f8..a91651e22a9d6b7891255071b38217dc358781af 100644 +index d41bf1601fb5990ae70e0e13fb105677ef8f9b86..4d9b363c7c0eeb83f34cedf2266e939d4ad140e7 100644 --- a/Makefile +++ b/Makefile @@ -114,11 +114,11 @@ with-code-cache: diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch index ccf8774..7081cde 100644 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -1,4 +1,4 @@ -From a3aeb06b2ed164e220d1ef1ff42256c3e7d0ad25 Mon Sep 17 00:00:00 2001 +From f60c5f106a993adee0f66e44f70a1fee562108e0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher sgallagh@redhat.com Date: Tue, 1 May 2018 08:05:30 -0400 Subject: [PATCH 2/3] Suppress NPM message to run global update diff --git a/0003-Install-both-binaries-and-use-libdir.patch b/0003-Install-both-binaries-and-use-libdir.patch index cfd7de0..28b329b 100644 --- a/0003-Install-both-binaries-and-use-libdir.patch +++ b/0003-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From 7e18c5370e11d7cecc1801756870c036cf26dd12 Mon Sep 17 00:00:00 2001 +From 6be87e48c3b907dfb4c75b7f415b5107189799f0 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade quantum.analyst@gmail.com Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 3/3] Install both binaries and use libdir. @@ -13,10 +13,10 @@ Signed-off-by: Elliott Sales de Andrade quantum.analyst@gmail.com 2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/configure.py b/configure.py -index 1a0819e74113bc22a2e92eb08502b1fc33874343..caeb29d2868e0b88c98c3a5261dedd6305c5bc50 100755 +index 1dd6da6d2b997a3fea602c7ad4ab6ce4197bfc18..b0ae741588fa91cb4a0f6bd483ae0c6469cbc114 100755 --- a/configure.py +++ b/configure.py -@@ -529,10 +529,16 @@ parser.add_option('--shared', +@@ -534,10 +534,16 @@ parser.add_option('--shared', action='store_true', dest='shared', help='compile shared library for embedding node in another project. ' + @@ -33,7 +33,7 @@ index 1a0819e74113bc22a2e92eb08502b1fc33874343..caeb29d2868e0b88c98c3a5261dedd63 dest='without_v8_platform', default=False, help='do not initialize v8 platform during node.js startup. ' + -@@ -1053,10 +1059,11 @@ def configure_node(o): +@@ -1065,10 +1071,11 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) # TODO(refack): fix this when implementing embedded code-cache when cross-compiling. if o['variables']['want_separate_host_toolset'] == 0: diff --git a/node-v10.12.0/package.cfg b/node-v10.12.0/package.cfg deleted file mode 100644 index 832eaab..0000000 --- a/node-v10.12.0/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = master f29 diff --git a/nodejs-tarball.sh b/nodejs-tarball.sh index 237ae13..e19d80e 100755 --- a/nodejs-tarball.sh +++ b/nodejs-tarball.sh @@ -1,10 +1,12 @@ #!/bin/sh
version=$(rpm -q --specfile --qf='%{version}\n' nodejs.spec | head -n1) -rm -f node-v${version}.tar.gz +rm -f node-v${version}.tar.gz node-v${version}-stripped.tar.gz wget http://nodejs.org/dist/v$%7Bversion%7D/node-v$%7Bversion%7D.tar.gz tar -zxf node-v${version}.tar.gz rm -rf node-v${version}/deps/openssl tar -zcf node-v${version}-stripped.tar.gz node-v${version}
fedpkg new-sources node-v${version}-stripped.tar.gz + +rm -f node-v${version}.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 3adf5d3..48fe77c 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -12,13 +12,13 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 12 -%global nodejs_minor 0 +%global nodejs_minor 1 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 72 %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 @@ -64,19 +64,14 @@ %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
# ICU - from tools/icu/current_ver.dep -%global icu_major 63 -%global icu_minor 1 +%global icu_major 64 +%global icu_minor 2 %global icu_version %{icu_major}.%{icu_minor} +%global icu_flag small-icu
# OpenSSL minimum version %global openssl_minimum 1:1.1.1
-%if 0%{?fedora} >= 30 -%global icu_flag system-icu -%else -%global icu_flag small-icu -%endif - # punycode - from lib/punycode.js # Note: this was merged into the mainline since 0.6.x # Note: this will be unmerged in an upcoming major release @@ -583,6 +578,10 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Tue Apr 30 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.1.0-1 +- Update to 12.1.0 +- https://nodejs.org/en/blog/release/v12.1.0/ + * Wed Apr 24 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.0.0-3 - Fix upgrade bug for v8-devel (BZ #1702609)
diff --git a/sources b/sources index 8ee313f..1e6ee1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v12.0.0-stripped.tar.gz) = 68bec09de987059f361a9a7fb25a66eab35bd848a8dd2e000000ac6cc0c6fa2e7ec901ed0cd12e609b3303ecb6b598a10054afc66764d3d43153c323e773cb86 +SHA512 (node-v12.1.0-stripped.tar.gz) = 367111600786d57291725e0452f532d7c8c6bfe72259b654fc2518323cb7c49576fe8678de69b559b93cf7a03ae2a2fe4f116a43bba740b2d2e1df5e49582cae
commit bfa1e93cd6c7a6fa5f2542d5b5c7dd5c122bedd0 Author: Stephen Gallagher sgallagh@redhat.com Date: Wed Apr 24 09:00:10 2019 -0400
Fix upgrade bug for v8-devel (BZ #1702609)
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/nodejs.spec b/nodejs.spec index 5135cdd..3adf5d3 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -18,7 +18,7 @@ # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 72 %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 @@ -583,6 +583,9 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Wed Apr 24 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.0.0-3 +- Fix upgrade bug for v8-devel (BZ #1702609) + * Tue Apr 23 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.0.0-2 - Node.js 12.x requires OpenSSL 1.1.1+
commit 8d55b79675884b69289e9e8a1b77ebe541201e3e Author: Stephen Gallagher sgallagh@redhat.com Date: Wed Apr 24 08:59:37 2019 -0400
Properly replace v8-devel includes with symlinks
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/nodejs.spec b/nodejs.spec index 5eb096e..5135cdd 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -486,7 +486,7 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules:%{buildroot}%{_prefix}/lib/nod
%pretrans -n npm -p <lua> -- Remove all of the symlinks from the bundled npm node_modules directory --- This scriptlet can be removed in Fedora 31 +-- Drop this scriptlet when F29 is EOL base_path = "%{_prefix}/lib/node_modules/npm/node_modules/" d_st = posix.stat(base_path) if d_st then @@ -499,6 +499,23 @@ if d_st then end end
+%pretrans -n v8-devel -p <lua> +-- Replace the v8 libplatform include directory with a symlink +-- Drop this scriptlet when F30 is EOL +path = "%{_includedir}/libplatform" +st = posix.stat(path) +if st and st.type == "directory" then + status = os.rename(path, path .. ".rpmmoved") + if not status then + suffix = 0 + while not status do + suffix = suffix + 1 + status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) + end + os.rename(path, path .. ".rpmmoved") + end +end + %files %{_bindir}/node %dir %{_prefix}/lib/node_modules @@ -542,6 +559,7 @@ end %{_libdir}/libv8.so %{_libdir}/libv8_libbase.so %{_libdir}/libv8_libplatform.so +%ghost %{_includedir}/libplatform.rpmmoved
%files -n npm
commit 76581ac1db6b75d06f54f0edde04701305b9e94c Author: Stephen Gallagher sgallagh@redhat.com Date: Tue Apr 23 21:29:02 2019 -0400
Add Buildrequires: libatomic
s390x requires it to link properly and it's not harmful to have it available on all arches. Not making it conditional in case it would cause issues on a future archicture.
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/nodejs.spec b/nodejs.spec index 8c0a52d..5eb096e 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -137,6 +137,7 @@ BuildRequires: zlib-devel BuildRequires: gcc >= 4.9.4 BuildRequires: gcc-c++ >= 4.9.4 BuildRequires: chrpath +BuildRequires: libatomic
#%if ! 0%%{?bootstrap} %if %{with bootstrap}
commit ff8041427b9b76c7625c69bad9ac048de28541cc Author: Stephen Gallagher sgallagh@redhat.com Date: Tue Apr 23 17:30:36 2019 -0400
Node.js 12.x requires OpenSSL 1.1.1+
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/nodejs.spec b/nodejs.spec index 69cb8ee..8c0a52d 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -18,7 +18,7 @@ # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 72 %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 @@ -68,6 +68,9 @@ %global icu_minor 1 %global icu_version %{icu_major}.%{icu_minor}
+# OpenSSL minimum version +%global openssl_minimum 1:1.1.1 + %if 0%{?fedora} >= 30 %global icu_flag system-icu %else @@ -163,7 +166,8 @@ Provides: bundled(llhttp) = %{llhttp_version} BuildRequires: libicu-devel >= 62.1 %endif
-BuildRequires: openssl-devel +BuildRequires: openssl-devel >= %{openssl_minimum} +Requires: openssl >= %{openssl_minimum}
# we need the system certificate store Requires: ca-certificates @@ -560,6 +564,9 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Tue Apr 23 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.0.0-2 +- Node.js 12.x requires OpenSSL 1.1.1+ + * Tue Apr 23 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.0.0-1 - Release 12.0.0 - https://nodejs.org/en/blog/release/v12.0.0/
commit 1d1dc74d36847207ce69b46ad40ab9a1ffd33f3a Author: Stephen Gallagher sgallagh@redhat.com Date: Tue Apr 23 14:07:13 2019 -0400
Release 12.0.0
- https://nodejs.org/en/blog/release/v12.0.0/
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/0001-Disable-running-gyp-on-shared-deps.patch b/0001-Disable-running-gyp-on-shared-deps.patch index f6cb699..927de9f 100644 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,34 +1,29 @@ -From e4d1665c49d00d19be0650f92b98308f3ed251d1 Mon Sep 17 00:00:00 2001 +From be67711060761dcb520dc538582bc497c978a211 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova zsvetlik@redhat.com Date: Thu, 27 Apr 2017 14:25:42 +0200 Subject: [PATCH 1/3] Disable running gyp on shared deps
--- - Makefile | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile -index 3d8ef4dc5764bba4d6ed5bad3cc03a2045c3be86..bb75e85c345662ab5285f6f00be725f33c06cbf5 100644 +index d04aac3515a1812d120555297f2b340baaea58f8..a91651e22a9d6b7891255071b38217dc358781af 100644 --- a/Makefile +++ b/Makefile -@@ -122,14 +122,13 @@ with-code-cache: - +@@ -114,11 +114,11 @@ with-code-cache: .PHONY: test-code-cache test-code-cache: with-code-cache - $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache + echo "'test-code-cache' target is a noop"
--out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \ -- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \ -- deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \ -- config.gypi -+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \ -+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \ -+ deps/v8/gypfiles/v8.gyp node.gyp config.gypi + out/Makefile: config.gypi common.gypi node.gyp \ +- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ ++ deps/http_parser/http_parser.gyp \ + tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ + tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp $(PYTHON) tools/gyp_node.py -f make
config.gypi: configure configure.py - @if [ -x config.status ]; then \ - ./config.status; \ -- 2.21.0
diff --git a/0002-Suppress-NPM-message-to-run-global-update.patch b/0002-Suppress-NPM-message-to-run-global-update.patch index 08f4571..ccf8774 100644 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@ -1,4 +1,4 @@ -From aa203e18cd0a5398e5b7e1900ba71a0816c1fd3d Mon Sep 17 00:00:00 2001 +From a3aeb06b2ed164e220d1ef1ff42256c3e7d0ad25 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher sgallagh@redhat.com Date: Tue, 1 May 2018 08:05:30 -0400 Subject: [PATCH 2/3] Suppress NPM message to run global update @@ -9,10 +9,10 @@ Signed-off-by: Stephen Gallagher sgallagh@redhat.com 1 file changed, 54 deletions(-)
diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js -index 6f76b23828531e7af98a7e3cd7d5abfaac09b40c..98edb6f45fe073e03794a2ae6e7aa7f5500723ee 100755 +index 705aa472e7e5502311f24767adfb0aebab396772..e8aebe644f610bb09c3748338fd70e6c8c422cea 100755 --- a/deps/npm/bin/npm-cli.js +++ b/deps/npm/bin/npm-cli.js -@@ -67,69 +67,15 @@ +@@ -66,69 +66,15 @@ if (conf.usage && npm.command !== 'help') { npm.argv.unshift(npm.command) npm.command = 'help' diff --git a/0003-Install-both-binaries-and-use-libdir.patch b/0003-Install-both-binaries-and-use-libdir.patch index 2b77ef0..cfd7de0 100644 --- a/0003-Install-both-binaries-and-use-libdir.patch +++ b/0003-Install-both-binaries-and-use-libdir.patch @@ -1,4 +1,4 @@ -From bf276a108cf7710220c3ed2a8bd0685478703c9b Mon Sep 17 00:00:00 2001 +From 7e18c5370e11d7cecc1801756870c036cf26dd12 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade quantum.analyst@gmail.com Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 3/3] Install both binaries and use libdir. @@ -13,10 +13,10 @@ Signed-off-by: Elliott Sales de Andrade quantum.analyst@gmail.com 2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/configure.py b/configure.py -index 9f780ab9bca150df7a635af00c2976c1fb8156a7..f1f2b129466334436747c3e7f95b7bb6dc245253 100755 +index 1a0819e74113bc22a2e92eb08502b1fc33874343..caeb29d2868e0b88c98c3a5261dedd6305c5bc50 100755 --- a/configure.py +++ b/configure.py -@@ -560,10 +560,16 @@ parser.add_option('--shared', +@@ -529,10 +529,16 @@ parser.add_option('--shared', action='store_true', dest='shared', help='compile shared library for embedding node in another project. ' + @@ -33,11 +33,11 @@ index 9f780ab9bca150df7a635af00c2976c1fb8156a7..f1f2b129466334436747c3e7f95b7bb6 dest='without_v8_platform', default=False, help='do not initialize v8 platform during node.js startup. ' + -@@ -1106,10 +1112,11 @@ def configure_node(o): - +@@ -1053,10 +1059,11 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) - if options.code_cache_path: - o['variables']['node_code_cache_path'] = options.code_cache_path + # TODO(refack): fix this when implementing embedded code-cache when cross-compiling. + if o['variables']['want_separate_host_toolset'] == 0: + o['variables']['node_code_cache_path'] = 'yes' o['variables']['node_shared'] = b(options.shared) + o['variables']['libdir'] = options.libdir node_module_version = getmoduleversion.get_version() @@ -46,12 +46,12 @@ index 9f780ab9bca150df7a635af00c2976c1fb8156a7..f1f2b129466334436747c3e7f95b7bb6 shlib_suffix = '%s.dylib' elif sys.platform.startswith('aix'): diff --git a/tools/install.py b/tools/install.py -index 3befec213b1ce68b234f0a2602a8acd302fd8422..e7a6c67c3a72ee7745ba45049552a4e8feee5a61 100755 +index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..fe4723bf15012c8aacacb0393dc8294c049b0503 100755 --- a/tools/install.py +++ b/tools/install.py -@@ -120,30 +120,27 @@ def subdir_files(path, dest, action): - for subdir, files in ret.items(): - action(files, subdir + '/') +@@ -119,30 +119,27 @@ def subdir_files(path, dest, action): + for subdir, files_in_path in ret.items(): + action(files_in_path, subdir + '/')
def files(action): is_windows = sys.platform == 'win32' diff --git a/nodejs.spec b/nodejs.spec index ff77541..69cb8ee 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -11,12 +11,12 @@ # feature releases that are only supported for nine months, which is shorter # than a Fedora release lifecycle. %global nodejs_epoch 1 -%global nodejs_major 11 -%global nodejs_minor 14 +%global nodejs_major 12 +%global nodejs_minor 0 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h -%global nodejs_soversion 67 +%global nodejs_soversion 72 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1
@@ -25,9 +25,9 @@ # Epoch is set to ensure clean upgrades from the old v8 package %global v8_epoch 1 %global v8_major 7 -%global v8_minor 0 -%global v8_build 276 -%global v8_patch 38 +%global v8_minor 4 +%global v8_build 288 +%global v8_patch 21 # 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} @@ -48,18 +48,18 @@ # llhttp - from deps/llhttp/include/llhttp.h %global llhttp_major 1 %global llhttp_minor 1 -%global llhttp_patch 0 +%global llhttp_patch 1 %global llhttp_version %{llhttp_major}.%{llhttp_minor}.%{llhttp_patch}
# libuv - from deps/uv/include/uv/version.h %global libuv_major 1 -%global libuv_minor 27 +%global libuv_minor 28 %global libuv_patch 0 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch}
# nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h %global nghttp2_major 1 -%global nghttp2_minor 34 +%global nghttp2_minor 38 %global nghttp2_patch 0 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch}
@@ -85,7 +85,7 @@ # npm - from deps/npm/package.json %global npm_epoch 1 %global npm_major 6 -%global npm_minor 7 +%global npm_minor 9 %global npm_patch 0 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
@@ -324,7 +324,7 @@ The API documentation for the Node.js JavaScript runtime. rm -rf deps/zlib
# Replace any instances of unversioned python' with python2 -pathfix.py -i %{__python2} -pn $(find -type f) +pathfix.py -i %{__python2} -pn $(find -type f ! -name "*.js") find . -type f -exec sed -i "s~/usr/bin/env python~/usr/bin/python2~" {} ; find . -type f -exec sed -i "s~/usr/bin/python\W~/usr/bin/python2~" {} ; sed -i "s~python~python2~" $(find . -type f | grep "gyp$") @@ -560,6 +560,10 @@ end %{_pkgdocdir}/npm/doc
%changelog +* Tue Apr 23 2019 Stephen Gallagher sgallagh@redhat.com - 1:12.0.0-1 +- Release 12.0.0 +- https://nodejs.org/en/blog/release/v12.0.0/ + * Thu Apr 11 2019 Stephen Gallagher sgallagh@redhat.com - 1:11.13.0-1 - Update to 11.13.0 - https://nodejs.org/en/blog/release/v11.13.0/ diff --git a/sources b/sources index 0162cfe..8ee313f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v11.14.0-stripped.tar.gz) = a54c5b885fdbff8de7233f2d88667a0638676fb3461cc99e50e5a022170233f10c6a55cd86e4321fd143f48654dcceca924807aed574558e47e4c821780755f2 +SHA512 (node-v12.0.0-stripped.tar.gz) = 68bec09de987059f361a9a7fb25a66eab35bd848a8dd2e000000ac6cc0c6fa2e7ec901ed0cd12e609b3303ecb6b598a10054afc66764d3d43153c323e773cb86
commit 302af5c550fc929543b94452cac067c8741c4252 Author: Stephen Gallagher sgallagh@redhat.com Date: Thu Apr 11 20:02:40 2019 -0400
Fix libnode soversion
Signed-off-by: Stephen Gallagher sgallagh@redhat.com
diff --git a/nodejs.spec b/nodejs.spec index 6301c0c..ff77541 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -15,7 +15,8 @@ %global nodejs_minor 14 %global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} -%global nodejs_soversion 64 +# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h +%global nodejs_soversion 67 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1
commit 8c0820b716faf05dc691e21d0ecfd6926ad9e613 Merge: ce85601 1fa28cd Author: Stephen Gallagher sgallagh@redhat.com Date: Thu Apr 11 15:24:13 2019 -0400
Merge branch '10' into 11
diff --cc 0001-Disable-running-gyp-on-shared-deps.patch index 79cbc7e,ba4c437..f6cb699 --- a/0001-Disable-running-gyp-on-shared-deps.patch +++ b/0001-Disable-running-gyp-on-shared-deps.patch @@@ -1,17 -1,17 +1,17 @@@ - From def28d29f907050d8bcd94ed2e341d128ffa3fa6 Mon Sep 17 00:00:00 2001 -From 223cfda05cf681b8dfe6f24fbb7d5360d1bfdeee Mon Sep 17 00:00:00 2001 ++From e4d1665c49d00d19be0650f92b98308f3ed251d1 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova zsvetlik@redhat.com Date: Thu, 27 Apr 2017 14:25:42 +0200 - Subject: [PATCH 1/2] Disable running gyp on shared deps + Subject: [PATCH 1/3] Disable running gyp on shared deps
--- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile - index 5fc2bb0c58f5532044a14e9f9595b2316f562726..f1c1545caa220d7442d6d92c49412ec7554de123 100644 -index 4e7263924cf19ac3a3a3670d28d835b21820fd6c..78ffc37bf1a39ad8f8a430a507a2fbffb9029a20 100644 ++index 3d8ef4dc5764bba4d6ed5bad3cc03a2045c3be86..bb75e85c345662ab5285f6f00be725f33c06cbf5 100644 --- a/Makefile +++ b/Makefile --@@ -121,14 +121,13 @@ with-code-cache: ++@@ -122,14 +122,13 @@ with-code-cache:
.PHONY: test-code-cache test-code-cache: with-code-cache diff --cc 0002-Suppress-NPM-message-to-run-global-update.patch index fd54ee2,fed3000..08f4571 --- a/0002-Suppress-NPM-message-to-run-global-update.patch +++ b/0002-Suppress-NPM-message-to-run-global-update.patch @@@ -1,7 -1,7 +1,7 @@@ - From ab6c18fd9aba942bee3f2f8030273c846b6025a6 Mon Sep 17 00:00:00 2001 -From 945b762887c65c2c70024de259e27db8a0a31859 Mon Sep 17 00:00:00 2001 ++From aa203e18cd0a5398e5b7e1900ba71a0816c1fd3d Mon Sep 17 00:00:00 2001 From: Stephen Gallagher sgallagh@redhat.com Date: Tue, 1 May 2018 08:05:30 -0400 - Subject: [PATCH 2/2] Suppress NPM message to run global update + Subject: [PATCH 2/3] Suppress NPM message to run global update
Signed-off-by: Stephen Gallagher sgallagh@redhat.com --- diff --cc 0003-Install-both-binaries-and-use-libdir.patch index 0000000,7b92718..2b77ef0 mode 000000,100644..100644 --- a/0003-Install-both-binaries-and-use-libdir.patch +++ b/0003-Install-both-binaries-and-use-libdir.patch @@@ -1,0 -1,98 +1,98 @@@ -From ec52fb7c987b3fe68560ae878b4b0f522f01f8a5 Mon Sep 17 00:00:00 2001 ++From bf276a108cf7710220c3ed2a8bd0685478703c9b Mon Sep 17 00:00:00 2001 + From: Elliott Sales de Andrade quantum.analyst@gmail.com + Date: Tue, 19 Mar 2019 23:22:40 -0400 + Subject: [PATCH 3/3] Install both binaries and use libdir. + + This allows us to build with a shared library for other users while + still providing the normal executable. + + Signed-off-by: Elliott Sales de Andrade quantum.analyst@gmail.com + --- + configure.py | 7 +++++++ + tools/install.py | 29 +++++++++++++---------------- + 2 files changed, 20 insertions(+), 16 deletions(-) + + diff --git a/configure.py b/configure.py -index 0ad986ab82e29fdc436794b7f24e49afe1239dca..a58420fc618fe9ad79dcdc27bb6758f34ffaa481 100755 ++index 9f780ab9bca150df7a635af00c2976c1fb8156a7..f1f2b129466334436747c3e7f95b7bb6dc245253 100755 + --- a/configure.py + +++ b/configure.py -@@ -550,10 +550,16 @@ parser.add_option('--shared', ++@@ -560,10 +560,16 @@ parser.add_option('--shared', + action='store_true', + dest='shared', + help='compile shared library for embedding node in another project. ' + + '(This mode is not officially supported for regular applications)') + + +parser.add_option('--libdir', + + action='store', + + dest='libdir', + + default='lib', + + help='a directory to install the shared library into') + + + parser.add_option('--without-v8-platform', + action='store_true', + dest='without_v8_platform', + default=False, + help='do not initialize v8 platform during node.js startup. ' + -@@ -1093,10 +1099,11 @@ def configure_node(o): ++@@ -1106,10 +1112,11 @@ def configure_node(o): + + o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) + if options.code_cache_path: + o['variables']['node_code_cache_path'] = options.code_cache_path + o['variables']['node_shared'] = b(options.shared) + + o['variables']['libdir'] = options.libdir + node_module_version = getmoduleversion.get_version() + + if sys.platform == 'darwin': + shlib_suffix = '%s.dylib' + elif sys.platform.startswith('aix'): + diff --git a/tools/install.py b/tools/install.py -index 028c32ecbbdf9625238dfcc2baef66df9408b539..bf443c4d15a3b3ebf1e10a5dd802e9c5999691e5 100755 ++index 3befec213b1ce68b234f0a2602a8acd302fd8422..e7a6c67c3a72ee7745ba45049552a4e8feee5a61 100755 + --- a/tools/install.py + +++ b/tools/install.py -@@ -115,30 +115,27 @@ def subdir_files(path, dest, action): ++@@ -120,30 +120,27 @@ def subdir_files(path, dest, action): + for subdir, files in ret.items(): + action(files, subdir + '/') + + def files(action): + is_windows = sys.platform == 'win32' + - output_file = 'node' + output_prefix = 'out/Release/' + + output_libprefix = output_prefix + + - if 'false' == variables.get('node_shared'): + - if is_windows: + - output_file += '.exe' + + if is_windows: + + output_bin = 'node.exe' + + output_lib = 'node.dll' + else: + - if is_windows: + - output_file += '.dll' + - else: + - output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix') + - # GYP will output to lib.target except on OS X, this is hardcoded + - # in its source - see the _InstallableTargetInstallPath function. + - if sys.platform != 'darwin': + - output_prefix += 'lib.target/' + + output_bin = 'node' + + output_lib = 'libnode.' + variables.get('shlib_suffix') + + # GYP will output to lib.target except on OS X, this is hardcoded + + # in its source - see the _InstallableTargetInstallPath function. + + if sys.platform != 'darwin': + + output_libprefix += 'lib.target/' + + - if 'false' == variables.get('node_shared'): + - action([output_prefix + output_file], 'bin/' + output_file) + - else: + - action([output_prefix + output_file], 'lib/' + output_file) + + action([output_prefix + output_bin], 'bin/' + output_bin) + + if 'true' == variables.get('node_shared'): + + action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) + + if 'true' == variables.get('node_use_dtrace'): + action(['out/Release/node.d'], 'lib/dtrace/node.d') + + # behave similarly for systemtap + -- + 2.21.0 + diff --cc 0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch index 0436f75,0436f75..0000000 deleted file mode 100644,100644 --- a/0003-PATCH-PPC-use-pc-relative-address-to-init-constpool-.patch +++ /dev/null @@@ -1,128 -1,128 +1,0 @@@ --From cefa0fd937cb48a8431e62268b2c9500b104d4e5 Mon Sep 17 00:00:00 2001 --From: Junliang Yan jyan@ca.ibm.com --Date: Wed, 9 May 2018 18:39:49 -0400 --Subject: [PATCH 3/4] [PATCH] PPC: use pc-relative address to init constpool -- reg -- --R=joransiu@ca.ibm.com -- --Change-Id: I67364f29d494b09786a14b13743f73bef4b64582 --Reviewed-on: https://chromium-review.googlesource.com/950242 --Commit-Queue: Junliang Yan jyan@ca.ibm.com --Reviewed-by: Joran Siu joransiu@ca.ibm.com --Cr-Commit-Position: refs/heads/master@{#51750} -- --Signed-off-by: Stephen Gallagher sgallagh@redhat.com ----- -- deps/v8/src/ppc/macro-assembler-ppc.cc | 14 ++++++++++---- -- deps/v8/src/ppc/macro-assembler-ppc.h | 9 +++++---- -- 2 files changed, 15 insertions(+), 8 deletions(-) -- --diff --git a/deps/v8/src/ppc/macro-assembler-ppc.cc b/deps/v8/src/ppc/macro-assembler-ppc.cc --index 68efa84c72c7f6d781d508183b53ea83024944d1..3192e9cefb1c1b116c5e12b5c52e7971b92a111a 100644 ----- a/deps/v8/src/ppc/macro-assembler-ppc.cc --+++ b/deps/v8/src/ppc/macro-assembler-ppc.cc --@@ -166,11 +166,11 @@ void TurboAssembler::Call(Register target) {
arch-excludes@lists.fedoraproject.org