Ignore:
Timestamp:
12/04/2021 03:28:15 PM (2 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
lazarus
Children:
e6974d1
Parents:
b22e4ceb (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into lazarus

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/nodejs.xml

    rb22e4ceb r8307474  
    77  <!ENTITY nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
    88  <!ENTITY nodejs-download-ftp  " ">
    9   <!ENTITY nodejs-md5sum        "770b3d14025366b00140b60c0400cffa">
     9  <!ENTITY nodejs-md5sum        "aeeb772ea8b14a52fd8f709d774f8fcd">
    1010  <!ENTITY nodejs-size          "32 MB">
    11   <!ENTITY nodejs-buildsize     "751 MB">
    12   <!ENTITY nodejs-time          "10 SBU (using parallelism=4; add 2.3 SBU for tests)">
     11  <!ENTITY nodejs-buildsize     "798 MB (add 26 MB for tests)">
     12  <!ENTITY nodejs-time          "18 SBU (add 2.9 SBU for tests: both using parallelism=4 and 4 CPUs online, parts of the tests will use all online CPUs)">
    1313]>
    1414
     
    136136    </para>
    137137
    138 <screen><userinput>sed -i 's|ares_nameser.h|arpa/nameser.h|' src/cares_wrap.h &amp;&amp;
    139 ./configure --prefix=/usr                  \
    140             --shared-cares                 \
    141             --shared-libuv                 \
    142             --shared-openssl               \
    143             --shared-nghttp2               \
    144             --shared-zlib                  \
    145             --with-intl=system-icu         &amp;&amp;
     138<screen><userinput>./configure --prefix=/usr          \
     139            --shared-cares         \
     140            --shared-libuv         \
     141            --shared-openssl       \
     142            --shared-nghttp2       \
     143            --shared-zlib          \
     144            --with-intl=system-icu &amp;&amp;
    146145make</userinput></screen>
    147146
    148147    <para>
    149148      To test the results, issue: <command>make test-only</command>.
    150       One test in test/parallel/test-uv-errno.js is known to fail with
    151       libuv-1.42.0.
    152149    </para>
    153150
     
    162159  <sect2 role="commands">
    163160    <title>Command Explanations</title>
    164 
    165     <para>
    166       <parameter>sed -i 's%ares_\(nameser.h\)%arpa/\1%' ...</parameter>:
    167       This fixes building with the system version of c-ares.
    168     </para>
    169161
    170162    <para>
Note: See TracChangeset for help on using the changeset viewer.