From a4a01ebc744a8952aa85ac347bf11863a2297c2e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 21 Dec 2018 16:37:45 -0500 Subject: [PATCH] use prebuilt node on rhel7 --- .gitignore | 1 + chromium.spec | 12 +++++++++++- sources | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4a49cb45..8f49a5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /chromium-70.0.3538.77-clean.tar.xz /chromium-70.0.3538.110-clean.tar.xz /chromium-71.0.3578.98-clean.tar.xz +/node-v8.9.1-linux-x64.tar.gz diff --git a/chromium.spec b/chromium.spec index b3c89c55..c9d09361 100644 --- a/chromium.spec +++ b/chromium.spec @@ -344,7 +344,10 @@ Source15: http://download.savannah.nongnu.org/releases/freebangfont/MuktiNarrow- Source16: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf Source17: GardinerModBug.ttf Source18: GardinerModCat.ttf - +# RHEL needs newer nodejs +%if 0%{?rhel} +Source19: node-v8.9.1-linux-x64.tar.gz +%endif # We can assume gcc and binutils. BuildRequires: gcc-c++ @@ -1075,8 +1078,15 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_cups=false use_dbus=false use_gio=false use_ CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false' export CHROMIUM_HEADLESS_GN_DEFINES +%if 0%{?rhel} +pushd third_party/node/linux +tar xf %{SOURCE19} +mv node-v8.9.1-linux-x64 node-linux-x64 +popd +%else mkdir -p third_party/node/linux/node-linux-x64/bin ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node +%endif # Remove most of the bundled libraries. Libraries specified below (taken from # Gentoo's Chromium ebuild) are the libraries that needs to be preserved. diff --git a/sources b/sources index 4b6d47b3..f0cf1391 100644 --- a/sources +++ b/sources @@ -17,3 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0 SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (chromium-71.0.3578.98-clean.tar.xz) = 8e92cefb1079944a742cd99ef4b50baa71a4517420b7e30bd9cba556df9a032f1dd08acd421e0ad28b40c4d93367529029edebd8c2e6c25ccec2ab231c81828c +SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844