From 7136699056d4cb9b75494c65dab85efcd404dce1 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 16 Mar 2023 11:36:43 -0400 Subject: [PATCH] Update to 19.8.1 - Namespace the v8 compatibility libraries Signed-off-by: Stephen Gallagher --- nodejs20.spec | 36 +++++++++++++++++++++++++++--------- packaging/nodejs.spec.j2 | 33 +++++++++++++++++++++++++-------- sources | 6 +++--- 3 files changed, 55 insertions(+), 20 deletions(-) diff --git a/nodejs20.spec b/nodejs20.spec index 7d20aea..77751dc 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -27,7 +27,7 @@ %global nodejs_epoch 1 %global nodejs_major 19 %global nodejs_minor 8 -%global nodejs_patch 0 +%global nodejs_patch 1 # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 111 %global nodejs_abi %{nodejs_soversion} @@ -43,7 +43,8 @@ %global nodejs_default %{nodejs_major} %endif -%global nodejs_private_sitelib %{nodejs_sitelib}_%{nodejs_major} +%global nodejs_default_sitelib %{_prefix}/lib/node_modules +%global nodejs_private_sitelib %{nodejs_default_sitelib}_%{nodejs_major} # == Bundled Dependency Versions == @@ -537,12 +538,12 @@ mv out/Release/lib/libnode.so.%{nodejs_soversion} out/Release/ # own the sitelib directory -mv %{buildroot}%{nodejs_sitelib} \ +mv %{buildroot}%{nodejs_default_sitelib} \ %{buildroot}%{nodejs_private_sitelib} %if 0%{?nodejs_default} ln -srf %{buildroot}%{nodejs_private_sitelib} \ - %{buildroot}%{nodejs_sitelib} + %{buildroot}%{nodejs_default_sitelib} %else rm -f %{buildroot}%{_datadir}/systemtap/tapset/node.stp %endif @@ -589,10 +590,18 @@ for header in %{buildroot}%{_includedir}/node/libplatform %{buildroot}%{_include ln -sf ./node/${header} %{buildroot}%{_includedir}/${header} done ln -s ./node/cppgc %{buildroot}%{_includedir}/cppgc + +for soname in libv8 libv8_libbase libv8_libplatform; do + ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so + ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so.%{v8_major} +done + +%if 0%{?nodejs_default} for soname in libv8 libv8_libbase libv8_libplatform; do ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major} done +%endif # install documentation mkdir -p %{buildroot}%{_pkgdocdir}/html @@ -613,7 +622,7 @@ mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit mkdir -p %{buildroot}%{_mandir}/nodejs-%{nodejs_major}/man1 \ %{buildroot}%{_mandir}/nodejs-%{nodejs_major}/man5 \ %{buildroot}%{_mandir}/nodejs-%{nodejs_major}/man7 \ - %{buildroot}%{nodejs_sitelib}/npm/man \ + %{buildroot}%{nodejs_default_sitelib}/npm/man \ %{buildroot}%{nodejs_private_sitelib}/npm/man \ %{buildroot}%{_pkgdocdir}/npm @@ -738,12 +747,12 @@ end %files -n %{pkgname} -%doc AUTHORS CHANGELOG.md onboarding.md GOVERNANCE.md README.md +%doc CHANGELOG.md onboarding.md GOVERNANCE.md README.md %if 0%{?nodejs_default} %{_bindir}/node %doc %{_mandir}/man1/node.1* -%{nodejs_sitelib} +%{nodejs_default_sitelib} %endif @@ -769,19 +778,28 @@ end %files -n %{pkgname}-libs %license LICENSE %{_libdir}/libnode.so.%{nodejs_soversion} +%{_libdir}/%{pkgname}-libv8.so.%{v8_major} +%{_libdir}/%{pkgname}-libv8_libbase.so.%{v8_major} +%{_libdir}/%{pkgname}-libv8_libplatform.so.%{v8_major} +%dir %{nodejs_datadir}/ +%if 0%{?nodejs_default} %{_libdir}/libv8.so.%{v8_major} %{_libdir}/libv8_libbase.so.%{v8_major} %{_libdir}/libv8_libplatform.so.%{v8_major} -%dir %{nodejs_datadir}/ - +%endif %files -n v8-%{v8_major}.%{v8_minor}-devel %{_includedir}/libplatform %{_includedir}/v8*.h %{_includedir}/cppgc +%{_libdir}/%{pkgname}-libv8.so +%{_libdir}/%{pkgname}-libv8_libbase.so +%{_libdir}/%{pkgname}-libv8_libplatform.so +%if 0%{?nodejs_default} %{_libdir}/libv8.so %{_libdir}/libv8_libbase.so %{_libdir}/libv8_libplatform.so +%endif %files -n %{pkgname}-npm diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2 index 0ca55d8..89d9f25 100644 --- a/packaging/nodejs.spec.j2 +++ b/packaging/nodejs.spec.j2 @@ -43,7 +43,8 @@ %global nodejs_default %{nodejs_major} %endif -%global nodejs_private_sitelib %{nodejs_sitelib}_%{nodejs_major} +%global nodejs_default_sitelib %{_prefix}/lib/node_modules +%global nodejs_private_sitelib %{nodejs_default_sitelib}_%{nodejs_major} # == Bundled Dependency Versions == @@ -549,12 +550,12 @@ mv out/Release/lib/libnode.so.%{nodejs_soversion} out/Release/ # own the sitelib directory -mv %{buildroot}%{nodejs_sitelib} \ +mv %{buildroot}%{nodejs_default_sitelib} \ %{buildroot}%{nodejs_private_sitelib} %if 0%{?nodejs_default} ln -srf %{buildroot}%{nodejs_private_sitelib} \ - %{buildroot}%{nodejs_sitelib} + %{buildroot}%{nodejs_default_sitelib} %else rm -f %{buildroot}%{_datadir}/systemtap/tapset/node.stp %endif @@ -601,10 +602,18 @@ for header in %{buildroot}%{_includedir}/node/libplatform %{buildroot}%{_include ln -sf ./node/${header} %{buildroot}%{_includedir}/${header} done ln -s ./node/cppgc %{buildroot}%{_includedir}/cppgc + +for soname in libv8 libv8_libbase libv8_libplatform; do + ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so + ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/%{pkgname}-${soname}.so.%{v8_major} +done + +%if 0%{?nodejs_default} for soname in libv8 libv8_libbase libv8_libplatform; do ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so ln -s libnode.so.%{nodejs_soversion} %{buildroot}%{_libdir}/${soname}.so.%{v8_major} done +%endif # install documentation mkdir -p %{buildroot}%{_pkgdocdir}/html @@ -625,7 +634,7 @@ mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit mkdir -p %{buildroot}%{_mandir}/nodejs-%{nodejs_major}/man1 \ %{buildroot}%{_mandir}/nodejs-%{nodejs_major}/man5 \ %{buildroot}%{_mandir}/nodejs-%{nodejs_major}/man7 \ - %{buildroot}%{nodejs_sitelib}/npm/man \ + %{buildroot}%{nodejs_default_sitelib}/npm/man \ %{buildroot}%{nodejs_private_sitelib}/npm/man \ %{buildroot}%{_pkgdocdir}/npm @@ -750,12 +759,12 @@ end %files -n %{pkgname} -%doc AUTHORS CHANGELOG.md onboarding.md GOVERNANCE.md README.md +%doc CHANGELOG.md onboarding.md GOVERNANCE.md README.md %if 0%{?nodejs_default} %{_bindir}/node %doc %{_mandir}/man1/node.1* -%{nodejs_sitelib} +%{nodejs_default_sitelib} {% if NODE_MAJOR < 19 -%} %dir %{_datadir}/systemtap @@ -788,18 +797,26 @@ end %license LICENSE %{_libdir}/libnode.so.%{nodejs_soversion} %{_libdir}/libv8.so.%{v8_major} +%{_libdir}/%{pkgname}-libv8_libbase.so.%{v8_major} +%{_libdir}/%{pkgname}-libv8_libplatform.so.%{v8_major} +%dir %{nodejs_datadir}/ +%if 0%{?nodejs_default} %{_libdir}/libv8_libbase.so.%{v8_major} %{_libdir}/libv8_libplatform.so.%{v8_major} -%dir %{nodejs_datadir}/ - +%endif %files -n v8-%{v8_major}.%{v8_minor}-devel %{_includedir}/libplatform %{_includedir}/v8*.h %{_includedir}/cppgc +%{_libdir}/%{pkgname}-libv8.so +%{_libdir}/%{pkgname}-libv8_libbase.so +%{_libdir}/%{pkgname}-libv8_libplatform.so +%if 0%{?nodejs_default} %{_libdir}/libv8.so %{_libdir}/libv8_libbase.so %{_libdir}/libv8_libplatform.so +%endif %files -n %{pkgname}-npm diff --git a/sources b/sources index 72c7f41..41aa80d 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (node-v19.8.0-stripped.tar.gz) = 2f0f12d22824e27cc8e2699e024adcdb722da8ab6cb6579451bec2cb1df039f292d4f2926dabcd7e7393fd9688cc4efb59d053f9e1160e423541922a64889e59 +SHA512 (node-v19.8.1-stripped.tar.gz) = a28bc87d1fa92f08b3d26fbc09d20e2d7446ee1cfcb5b334f12ac7910bebeb6df1bb72f7bdabd0e2358e8ab826bb39468562b6f34e63e7383283b5b374229175 SHA512 (icu4c-72_1-data-bin-b.zip) = ed0ce3ebd02f81cca7b3808abc72dc99962eb36bd123ebdf45c578b307b674566491191b6f7d261c679b2b5662b7084c61452b98968b35df3f749d413d5d7663 SHA512 (icu4c-72_1-data-bin-l.zip) = cc9a8cf2a89dacde4fab4a68ca7a7ba1fd106b71ebc23318fb9293ab96001be825bf89b1daf3da02958ba201ca4f714a67a26db3a51dc03653b9970ebdd5ff56 -SHA512 (cjs-module-lexer-1.2.2-stripped.tar.gz) = 398cf7eef7c396b16d26d71a0eebb9e7e2027111d8e2b9b9244e1b769ed461e28614c8f4c8548302d772650679c78e31d592a2212a7ae2623a3de211ea7a10d8 +SHA512 (cjs-module-lexer-1.2.2-stripped.tar.gz) = 2adef1323ee3031756840ee1146323983571ababc51befb40e96a23b2880fdc7763e178bd3cd0488c575f728facbe36f83d39cd114c4f4f14914cdc7c90df42b SHA512 (wasi-sdk-11.0-linux.tar.gz) = e3ed4597f7f2290967eef6238e9046f60abbcb8633a4a2a51525d00e7393df8df637a98a5b668217d332dd44fcbf2442ec7efd5e65724e888d90611164451e20 -SHA512 (undici-5.21.0-stripped.tar.gz) = 975a8609727320e39f2de31496ec2d6c2bdf75914c85868a92bce413d204cf55c1b6d48ef1da6cae37ebaaa14c75fcb986995732058000dcdb9585980ec59826 +SHA512 (undici-5.21.0-stripped.tar.gz) = a98db01c51018fa731cef87d2b1558f2e7bb1f93b7d498898d4e9b65a3379dceb1f8397430c676d523a8c1d0b95c482bb5201a50f7f6b2696e3c32ecc0ae2c55 SHA512 (wasi-sdk-14.0-linux.tar.gz) = 288a367e051f5b3f5853de97fabaedd3acf2255819d50c24f48f573897518500ea808342fd9aea832b2a5717089807bf1cbcf6d46b156b4eb60cc6b3c02ee997