linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 15:12:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Browse Source
This commit is contained in:
Bruce Dubbs 2022-11-08 18:29:07 -06:00
commit 27ccef2def
4 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
general/genlib/nodejs.xml
View File

@ -6,10 +6,10 @@
<!ENTITY nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
<!ENTITY nodejs-download-ftp " ">
<!ENTITY nodejs-md5sum "d47153d56d60f00ffcb33d63eacc2663">
<!ENTITY nodejs-size "34 MB">
<!ENTITY nodejs-buildsize "772 MB (add 29 MB for tests)">
<!ENTITY nodejs-time "13 SBU (add 4.4 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
<!ENTITY nodejs-md5sum "7322f55ce420f49378515b67d73faf88">
<!ENTITY nodejs-size "37 MB">
<!ENTITY nodejs-buildsize "930 MB (add 29 MB for tests)">
<!ENTITY nodejs-time "18 SBU (add 4.6 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
]>
<sect1 id="nodejs" xreflabel="nodejs-&nodejs-version;">
@ -82,15 +82,6 @@
</itemizedlist>
-->
<!--<note>
<para>
This tarball was created using a BSD version of
<application>tar</application> and extracting it with a linux&trade;
version will produce harmless warnings about unknown extended header
keywords.
</para>
</note>-->
<bridgehead renderas="sect3">Node.js Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@ -129,6 +120,13 @@
<screen><userinput>patch -Np1 -i ../node-v&nodejs-version;-icu_69-1.patch</userinput></screen>
-->
<para>
The <command>configure</command> script for this version of Node.js is
not aware of Python-3.11. If you have installed <xref linkend="python3"/>,
apply the following change (do not apply if you still have Python-3.10):
</para>
<screen><userinput>sed -i s/10/11/g configure</userinput></screen>
<para>
Build <application>Node.js</application> by running the following
@ -169,9 +167,6 @@ ln -sf node /usr/share/doc/node-&nodejs-version;</userinput></screen>
</para>
<para>
<!-- FIXME : reinstate nghttp2 in this if build is fixed
FIXME cont: Seems to be fixed in 12.18.1 -renodr
<parameter>\-\-shared-{cares,libuv,nghttp2,openssl,zlib}</parameter>: -->
<parameter>--shared-{cares,libuv,nghttp2,openssl,zlib}</parameter>:
use the system installed libraries instead of local copies.
</para>
@ -199,7 +194,7 @@ ln -sf node /usr/share/doc/node-&nodejs-version;</userinput></screen>
<seglistitem>
<seg>
node, npm, and npx
corepack, node, npm, and npx
</seg>
<seg>
None
@ -218,6 +213,19 @@ ln -sf node /usr/share/doc/node-&nodejs-version;</userinput></screen>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
<varlistentry id="corepack">
<term><command>corepack</command></term>
<listitem>
<para>
is an experimental tool to help with managing versions of package
managers.
</para>
<indexterm zone="nodejs corepack">
<primary sortas="b-corepack">corepack</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="node">
<term><command>node</command></term>
<listitem>

4
introduction/welcome/changelog.xml
View File

@ -56,6 +56,10 @@
<para>[bdubbs] - Update to btrfs-progs-v6.0.1. Fixes
<ulink url="&blfs-ticket-root;17271">#17271</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Update to node.js-18.12.1. Fixes
<ulink url="&blfs-ticket-root;17228">#17228</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to sudo-1.9.12p1. Fixes
<ulink url="&blfs-ticket-root;17270">#17270</ulink>.</para>

2
packages.ent
View File

@ -166,7 +166,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY libwpe-version "1.14.0">
<!ENTITY lzo-version "2.10">
<!ENTITY mtdev-version "1.1.6">
<!ENTITY nodejs-version "16.18.0">
<!ENTITY nodejs-version "18.12.1">
<!ENTITY npth-version "1.6">
<!ENTITY nspr-version "4.35">
<!ENTITY pcre-version "8.45">

13
xsoft/graphweb/firefox.xml
View File

@ -363,13 +363,22 @@ echo "613364a7-9418-4c86-bcee-57e32fd70c23" > mozilla-key</userinput></screen>
<screen><userinput>grep -rl \"rU\" | xargs sed -i 's/"rU"/"r"/'</userinput></screen>
<para>
Then fix an issue with regular expressions in python-3.11:
</para>
<screen><userinput>sed -e 's/?s)\./?s:.)/' \
-e '/?m)/{s/?m)/?m:/;s/\$"/$)"/}' \
-e '/?s)%/{s/?s)/?s:/;s/?"/?)"/}' \
-i xpcom/idl-parser/xpidl/xpidl.py</userinput></screen>
<para>
Now invoke the Python <command>mach</command> script to compile the package.
</para>
<screen><userinput>export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &amp;&amp;
export MOZBUILD_STATE_PATH=${PWD}/mozbuild &amp;&amp;
./mach configure &amp;&amp;
export MOZBUILD_STATE_PATH=${PWD}/mozbuild &amp;&amp;
./mach configure &amp;&amp;
./mach build</userinput></screen>
<para>