diff options
Diffstat (limited to 'net-libs/nodejs')
-rw-r--r-- | net-libs/nodejs/Manifest | 31 | ||||
-rw-r--r-- | net-libs/nodejs/files/nodejs-20.11.0-riscv.patch | 155 | ||||
-rw-r--r-- | net-libs/nodejs/metadata.xml | 2 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-18.20.3.ebuild | 256 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-18.20.4.ebuild (renamed from net-libs/nodejs/nodejs-18.20.1.ebuild) | 7 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-20.12.1.ebuild | 262 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-20.15.1.ebuild (renamed from net-libs/nodejs/nodejs-20.14.0.ebuild) | 8 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-20.17.0.ebuild (renamed from net-libs/nodejs/nodejs-20.15.0.ebuild) | 15 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-22.4.1-r1.ebuild (renamed from net-libs/nodejs/nodejs-22.4.0.ebuild) | 20 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-22.7.0.ebuild (renamed from net-libs/nodejs/nodejs-22.3.0.ebuild) | 41 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-22.8.0.ebuild | 291 | ||||
-rw-r--r-- | net-libs/nodejs/nodejs-99999999.ebuild | 60 |
12 files changed, 416 insertions, 732 deletions
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index d9ad38314b26..44acb915696e 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,20 +1,17 @@ AUX nodejs-18.16.0-paxmarking.patch 3470 BLAKE2B 4de01a4b3267d24c7c899a9caf8dae3975a8ed4a82cfe4df2ffc6858a3e1153bd6801ec5f5dc17ab5984ffa2d3b5ec9651c80e6993bd20c14865b0d873f58547 SHA512 5f49c1ca953421b3aa07e0b93375e99c9e5f543b48df3cff833f5e55f7e1b511971c56ed250e36c8a7465229db135a8d2bd1319f2d09368788f6152f06ced4f9 -AUX nodejs-20.11.0-riscv.patch 7660 BLAKE2B 8af657b4c87f892a7e8ab4e0b0f6c8927841585cf71971cb3a0e9b508c182222ace7178fd76f12000432df8a1b51c1a553616a3797a16b35f9499edce1e84638 SHA512 29b42307e017de0ef54c2e80e5e56d771a04f282ca858bcd3300c68ef4d72bb2fb5f2841a85a9845ee17f1909a33a64c798da9ed624feb34fcb11661dbe9fe69 AUX nodejs-20.6.0-paxmarking.patch 3143 BLAKE2B 34b93f63481177f1b70d26bdbdb27674533016dd5cefe4161cfa49c3defc6316cbbf22df024d28e9d42687be78fb0a6ce6e95334cad386d6371ff1f7fd9063ee SHA512 6604a1c8041e28bea0ea8c4dd168d44fb4ae7d25b15db4e20c220bcf3697d08de5205dde502dda4d061ace36e3f8f3511f646b00acc0382c2c8dff64cf1bf8b8 AUX nodejs-22.2.0-riscv.patch 1760 BLAKE2B f5f033dd589637481d2a2f3e67cdbb7a6052bdb187d2666b145a76f23da6e36adeddfe2b6e1718ae4412df914f8517bec2cdc5c15b18eb9dca5dad7a6668cc04 SHA512 f2ff6da8cf5dcc994a7a20342e2928dc1821fbbf42891009a6234b6051277e0200d7e3fbba63b9a2773887591d0ad5ceb1bb3d25e5efeb557f6d00109a80253c -DIST node-v18.20.1.tar.xz 40434200 BLAKE2B 560e04d5da8c2f3f4ef82e67b483f2c5d9a59b0646108a1dfc0bd80b410b60b15ee517be7d720834232fc49ed5d94785ebd64282c9abd3c10bdcb883a6960a38 SHA512 08864a164cfde08e369653abd17f6fe549db014697bd36abd07233d5ae746417ef18ea80e3d3f3630503a21110bb5e0ebd0073b4f2885b00c2d46e6f31c386a3 -DIST node-v18.20.3.tar.xz 40610412 BLAKE2B 7f1cb88cd4bf51ca8933344a11f710c8748b88a9cfa38f6960b8f12f0b78afbecd0fae86608b81fcaca44d98042aae5807924bb09e2088491831d6eb08615ca2 SHA512 0f518e8f3985274d5b0f48eb574675fa0a1ade6f5e59a9de706b2ade3f8a82dbea1557611a6353422090a95846b5ed107ea2476f78bee787ef4f0db8c07bc999 -DIST node-v20.12.1.tar.xz 41743360 BLAKE2B 1e2819724051720321a429bb18967a12608e8f93ef1760c520a40c9130e6138f95ab4e87f1acbaa72142bdd801ec3050bc42d7e4fae8d6a62192c3511b922e0a SHA512 c51c4aa37cc80f3fe34381f2cdf431053124ec6b83fc8490573502adfab48601c382448132c9962ab135bebaffc257a9d5b63334ba8ff480db57b5706bbfed67 -DIST node-v20.14.0.tar.xz 41795876 BLAKE2B 588c380751c12f05ccc95146f6e7f9c3eadfc77e769d836cdca1832a7739a40723fd9a7a4e59a2ab4ad087a2b2def5da76ec28077996b59ae0a6d5b2bd15d2c6 SHA512 b6148c705b2152b20c6567a9bbcbbb3925972d17273e126613b350d1d117600e2d895a93d70f793523cb903337ace9527c541a38cb10137eb81ba992778ed243 -DIST node-v20.15.0.tar.xz 41868532 BLAKE2B 07049df11e18b90ee3ebc72fdd953a64a4a925f234fcf7bfb26c472d841bd3f6f34233670d1cc67ba592eeaa714de74c6a7b89ac5a9f62a321764023a86760de SHA512 2b041ee368ca27fa1f92ec8a43237423b7e2f81dabf525e20df7b9b200a46e6d9a8c4b82beb33ec58a9351e0eea865eadfadac3d9e4d3733b1d699f0b5d4bbf3 -DIST node-v22.3.0.tar.xz 44517412 BLAKE2B 38ed4e6de9be48fb252b809a0174420f0f201f583ef5fb46a446d74168a25b39e1fa95ede44bfee8e7099dfe5636b3fb2bcd1ba3d626d7dfcac01dec0bd84d0a SHA512 70d1508bb576d98ef138db5618a5b07ca4412ec8a2aa35c8ff1d76fc93221bff6d7b418ff60b9194c420ad810523d5aeb0ffa662d2fa99f9cecf299317698710 -DIST node-v22.4.0.tar.xz 46116620 BLAKE2B 262fc22bfe8bab2158a9e9fa274b03bb1ffd875814144fbd6cee45bf2641813363061affa5ebb9b657066899722616d41486046be11425d1a2005fa1261796e3 SHA512 6f7907021ec8c0b16d737da68ae9efa1e424aa38964456e01eb10a3f0111a6d6ceff31ba0f8876cd9df19d92de202e17cccf528b844242e5c66ff1f6b1867f55 -EBUILD nodejs-18.20.1.ebuild 7433 BLAKE2B e366853288364eddb38a0a598db70f83e5188a489ac2c5970eb21f9c993abd4807d87826536d0a1ea12315603edd5f0a714876d95d2aae1ef8e1ded8ee3e7030 SHA512 0a20a965b9c25f7319bc5dfca87e0ddf9f78f603a4dc334c68e750b847d5687b0e636fa199f089a004e72536435b334309ad042753a95f93800fb65515d77402 -EBUILD nodejs-18.20.3.ebuild 7435 BLAKE2B 39bec2924b1aa7fc0ee0670bfcb5b51cff9dbc82942512d615465d788e5e952fd1899f293e3e3e23e45b6d65691b5c33b0127ff1e41dfd4874e755281bd7c785 SHA512 2c0f6652acf55b924790dbed8bdcec2103f7752de31b69b32a82862fb646cb9411d8bcd5f3233b6352f9e7c1c0e5ac439f9b41c9704eee25c53ac89e4faaf72a -EBUILD nodejs-20.12.1.ebuild 7599 BLAKE2B 10339e186e827ab88b9830fbd76bab4a12a181fab9d6a6ce054948d8e1e64c32e54491bcc29ef6304827da39352f25ad73b01122c872c2667ee9d945f43368ca SHA512 cac02959f6cdfc3d99dbf918b910453a8175b2fce0a8dcaeebc64a21e4cb4186b19d5f4ce46b237de52c7e66e8f9a9dc4a353b9c12969f7370c82d91ef281b02 -EBUILD nodejs-20.14.0.ebuild 7564 BLAKE2B 2ea907259a8a6be81ef34562eeabcb7da8daf8fdff565dfaef87177c3cdff02d8c111e7748c59e3e59e041484485c997b8438ecabccca21f9e5215bed296bcb7 SHA512 6505abdde39cd07d2925c98597e2ccdb29db66631a0330b1b7c2dd00ad0e5995c47102fb351f5067b50d03e350fc0317b51c1799e84ac352d5086d33986dfe74 -EBUILD nodejs-20.15.0.ebuild 7567 BLAKE2B f91ca9f6bc88e927ae20a5af0f74a8fad87c995610eda2132a55ddbe9ab2df279d0f717dcc8e3e660358d6609de50dbb3fd76c6d4715c8e4d0e8b4016b7c65c0 SHA512 730eac7fa64742cda816d710720ca30d42a1a95db9b60e85282c7895115c437bb4e27986ff713657199a6947bb0b0cda8a2fc94912c8f7f0c032155eafe9509b -EBUILD nodejs-22.3.0.ebuild 7858 BLAKE2B 60f8887f76550810e2deb1742cf159c345d4d268919d357f3c7933dcf4bf5aa0cf2292477b067c60a25a3bb25a4377ddff8e514451540536ccf554ca146fc9e2 SHA512 cd7dcb08cd265757c685a6aa2e32774659c45494b6abd965ef2f98a1ef76dfb02037b3b1c817f0c2b6665175a856abdb8ea7d0a399a897fe503a6b4e6b8e3e6a -EBUILD nodejs-22.4.0.ebuild 7970 BLAKE2B c2795d8d18ebf7c04a7e1cf8640fa01a963a0ca8382195436635f71e6527e7758fbdd394a14eedf8ea9610f26b31a9b80b1d7691692f9de8c1821893ca8a9cbb SHA512 a1f35f8c14fc2481db4df530ccd3fe209493204f69b27e55fffd58a2b40810d0e3e103b48ee87421da7a96aa3d6f1002761989bbd4e5adb7fb889c117e339053 -EBUILD nodejs-99999999.ebuild 7406 BLAKE2B 71b0f9acf3a3cdf3181c7f1dc3ca2a290c5fefce6be6ab017483750a31f7bf3c996984b91f03e1144b2b6bf3cb852529b9f620974ab0484928d6a390890cf2dc SHA512 bc0b7c5171f11b9b2d29915e03614272653baba609d505885e4aaf5d51ed40291e82c5970bb7e914e41604dcb3788ecb85a0d5e8a9770aea73f77136f6915d1e -MISC metadata.xml 983 BLAKE2B 7e455047a955185d1e53797b2b0592c5242b7eb849617cf39366acbab41e4fd066d36d723dbc32760f591c933f068e643475fc1b58a2873a2f1221e1c5d44b71 SHA512 5e08a76e2704000aa83a2c63f6e821e83c302939c1a729c4ac73774cc85189da4eccc1a19b700babfe87c8f07327865171526550ddf16a4fc25fed834f4bf7a6 +DIST node-v18.20.4.tar.xz 40445740 BLAKE2B 0675f2aba1d9a9cd9aeb665ecb3a0f61b9caf39daeb6154941f84b9c423caa7a658c14b8c2c5e12d94424b2470748ec7fad28ecb10390d37f92eb7e50f8adc26 SHA512 1ccef99ebee3906f5bad3c1582f9551ced9bed15e6a047d59d1a23c6110004fb46ea4bebcf9899748c64109f78788d7365ee956444e645eaf397dabbcddda21e +DIST node-v20.15.1.tar.xz 41880412 BLAKE2B f113856db03a3306d50a659e21d11f585e9e78b85ce7ad9926cc778837f905c618ac762faf56e03caaa862ab0a38c5f34770cd2bfb0854d79650ee9d9b9e2bfe SHA512 2a2935490c4c629f47cc67819094904a1b91eaf0b75cbb8ebe92f5eb34b0929230932fa456bf1bec00213155ea8b6337b2e02e946fc18606543c8c71082615b9 +DIST node-v20.17.0.tar.xz 41751520 BLAKE2B 157cf4c3326fcd2f1324c0898018c88327df05c717acfa8d96728e1ebf378ea04e46da56b93e89041a49b5ee4b7e6070373401a2bc2e9163eec3b0dffb6ff4d3 SHA512 3f21c9b5b292143d25a9d51e24d8f9b366429872b3d905d705fb2293e4f4b11e8861650535425d498b999974971a8dec7bf9f9c398af03170caa84bdc63b94da +DIST node-v22.4.1.tar.xz 46125104 BLAKE2B 7e54a7e01f821d752abbec03212c5be838b2e12fdb10c50cfe05b0ec25ddbe71eaa3187ba25d99efb258ab14d31927216e6816aacdfa29efdb1dc70a06e9b135 SHA512 840423e9738cad9f6024e9b51b683893eab16487ba18183251a189b5d4acf9b4168e9245623092705b014bff2058174127d5d7ecb31c1a8b324961074cb8ca54 +DIST node-v22.7.0.tar.xz 46875872 BLAKE2B f0dcd07d3040ddc0df335b51da82bce8a963ce7848892cda5f593b7fa954a61d0b789f0f70d6b2d4ca80716fcabf70268ac94297c2acd3886ac8172eb5fdf6df SHA512 6d5b751a03b68beec3f046697a806918571b04799a0c5fbb0374026729cc2e88fb1787bef6235c19e0bfda4e7545a618bf375410553c7d9e1eb149c6d43c0c3b +DIST node-v22.8.0.tar.xz 46899840 BLAKE2B 04dc53ad42c6a913335ecd9b5bfd5bf2f2a8d3429f28d5eba59ebde62fd76be5dea90f12212bfa9dfaa6698000da6bfec08cb1f0e1e3d3b9e8af70cab005268e SHA512 c2942c65dc9909b1f412489a54d16afae7be46a5c2a8bd292cde75e4c56ec763ccee6572fd72774c3f9d94796cfff6edbd9e93976893873cc182548225ac162a +EBUILD nodejs-18.20.4.ebuild 7502 BLAKE2B 3eccdf88d47b7be4554a4dc9081319d7c1086941b3291c35a1d30fc9f4ae4baefe7d6279276f2de8ac553e8de21a24a0745b1f961ff1407a33c78dc5fcaf03cd SHA512 62fbe27d352c6e28661a05c7290dc7f82cc871cd733f9750e882da0101c74dffaef41869bcf585ec05742e8852e9e23a8e24d0cebc58fdf08cba6c54b686eaba +EBUILD nodejs-20.15.1.ebuild 7680 BLAKE2B ead46416ff32f2ec63ff79df0ee2431107d9de327c27f1f30d5d28e49649ddd220a63a88fed7e6339cd89e97a56527bd025b0999eb30d5a28e6ebf108b0158e1 SHA512 0e4d2bb01a6e367b6d25cd4ffc001b8720868b32d0a98101852698fc0143cff6bbf63b761da60238fae3a34c7cc592c4b93edd4f1c157a4b7b4a4de93a674080 +EBUILD nodejs-20.17.0.ebuild 7830 BLAKE2B 0b0b915b46ee8b579b242002faea6d8961a6b93395f7de451a6217ad933f434790c9e4c7ea9714f6ffe49221a5a90080df0f2f15e335486cb70d14ed37463f4f SHA512 39263f42231da710b14ed34a0990a3368c3428908281548605786b2c86d6e76ca02e8289d3975e9043fe703132ba06e5c7e1f0fe363a22e0410e0e75c05719f5 +EBUILD nodejs-22.4.1-r1.ebuild 8480 BLAKE2B 911e3bf47339a7686e1b1185df256aede40a895b87fc707bdd26b7621c14231f15fab65cb1665cf26737af4510dd43570bb477f41f63a7e36e12d2cc476d3d4a SHA512 855323f19f14929db1634373a3491f9a183740c878c903da3bf4bac69653c88283da0935fa09939c8eb07c96d6cece62faf98644e38958fc184606ea7eceb88f +EBUILD nodejs-22.7.0.ebuild 8565 BLAKE2B 9d4dfb5d22d96bf26db9a5183b3f0e13490f2c0f0226d4fadda5853c9935b1efe80001e96affb794458735a0138f982c4dd90e4fe65ee576fe15a25060f9f1d3 SHA512 be18feba5794e232b81c3cc803e321a720de4b6ddabb2adfdbe67e9bd3c23ca36a1582ad95857a43fd7adc070af31b86f0305602e5c37a908ad1c0feba66f5f4 +EBUILD nodejs-22.8.0.ebuild 8567 BLAKE2B 90e637e119bae122058be00ecf62f4dd5b883e1fa5829bde80908acfc59aa8cf5731a0b8b068d10058c4d9fac05f6777994f9569200e74b5f50de3f0dd8dd025 SHA512 2db592c44832de8224c71248ea8f479bef51a5fdbff96879104d90e0e005506259a8e9b412fe67efbf57e0b48028b332fe2b14241f3dbe362fa6afb303ddbad5 +EBUILD nodejs-99999999.ebuild 8567 BLAKE2B 90e637e119bae122058be00ecf62f4dd5b883e1fa5829bde80908acfc59aa8cf5731a0b8b068d10058c4d9fac05f6777994f9569200e74b5f50de3f0dd8dd025 SHA512 2db592c44832de8224c71248ea8f479bef51a5fdbff96879104d90e0e005506259a8e9b412fe67efbf57e0b48028b332fe2b14241f3dbe362fa6afb303ddbad5 +MISC metadata.xml 983 BLAKE2B 61908ba329bb50767f9a366c75acbedfb59da75a3e9966923af3fd4c686960115bfa53564e9dff19c1e5c3085a79ab5f5ca9a631da77ec4700fa2b663623d96e SHA512 471ee30d82ac553f975fe1e1e68ffcc79e8c709274ed6794a1c9fd2acee301734d36b6e607cc7b2cd386ed1e4621eb4a725efe440cb76d4dd6a2af4b76cdbd45 diff --git a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch b/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch deleted file mode 100644 index 3bf7a80ea078..000000000000 --- a/net-libs/nodejs/files/nodejs-20.11.0-riscv.patch +++ /dev/null @@ -1,155 +0,0 @@ -From dda5cdb15cfe5c7437f471054f5bd79a82b6eda2 Mon Sep 17 00:00:00 2001 -From: kxxt <rsworktech@outlook.com> -Date: Wed, 17 Jan 2024 09:16:34 +0800 -Subject: [PATCH] Revert "deps: V8: cherry-pick 13192d6e10fa" - -This reverts commit bc2ebb972b34f54e042de9636e7451d2526436a9, which -shouldn't be applied to v20.x. - -Fix https://github.com/nodejs/unofficial-builds/issues/106 ---- - common.gypi | 2 +- - deps/v8/src/builtins/riscv/builtins-riscv.cc | 2 +- - deps/v8/src/codegen/riscv/assembler-riscv-inl.h | 16 ++++++++-------- - deps/v8/src/codegen/riscv/assembler-riscv.h | 2 +- - deps/v8/src/execution/riscv/simulator-riscv.cc | 8 ++++---- - .../regexp/riscv/regexp-macro-assembler-riscv.cc | 2 +- - 6 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/common.gypi b/common.gypi -index db09a8a33df06..fa0729ffe45e8 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -36,7 +36,7 @@ - - # Reset this number to 0 on major V8 upgrades. - # Increment by one for each non-official patch applied to deps/v8. -- 'v8_embedder_string': '-node.17', -+ 'v8_embedder_string': '-node.18', - - ##### V8 defaults for Node.js ##### - -diff --git a/deps/v8/src/builtins/riscv/builtins-riscv.cc b/deps/v8/src/builtins/riscv/builtins-riscv.cc -index d6091434b9b0a..3404562785991 100644 ---- a/deps/v8/src/builtins/riscv/builtins-riscv.cc -+++ b/deps/v8/src/builtins/riscv/builtins-riscv.cc -@@ -1512,7 +1512,7 @@ static void Generate_InterpreterEnterBytecode(MacroAssembler* masm) { - // Set the return address to the correct point in the interpreter entry - // trampoline. - Label builtin_trampoline, trampoline_loaded; -- Tagged<Smi> interpreter_entry_return_pc_offset( -+ Smi interpreter_entry_return_pc_offset( - masm->isolate()->heap()->interpreter_entry_return_pc_offset()); - DCHECK_NE(interpreter_entry_return_pc_offset, Smi::zero()); - -diff --git a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h -index ca6d641e2c94e..55f191e6afe76 100644 ---- a/deps/v8/src/codegen/riscv/assembler-riscv-inl.h -+++ b/deps/v8/src/codegen/riscv/assembler-riscv-inl.h -@@ -128,9 +128,9 @@ Handle<HeapObject> Assembler::compressed_embedded_object_handle_at( - } - - void Assembler::deserialization_set_special_target_at( -- Address instruction_payload, Tagged<Code> code, Address target) { -+ Address instruction_payload, Code code, Address target) { - set_target_address_at(instruction_payload, -- !code.is_null() ? code->constant_pool() : kNullAddress, -+ !code.is_null() ? code.constant_pool() : kNullAddress, - target); - } - -@@ -159,13 +159,12 @@ void Assembler::deserialization_set_target_internal_reference_at( - } - } - --Tagged<HeapObject> RelocInfo::target_object(PtrComprCageBase cage_base) { -+HeapObject RelocInfo::target_object(PtrComprCageBase cage_base) { - DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_)); - if (IsCompressedEmbeddedObject(rmode_)) { -- return HeapObject::cast( -- Tagged<Object>(V8HeapCompressionScheme::DecompressTagged( -- cage_base, -- Assembler::target_compressed_address_at(pc_, constant_pool_)))); -+ return HeapObject::cast(Object(V8HeapCompressionScheme::DecompressTagged( -+ cage_base, -+ Assembler::target_compressed_address_at(pc_, constant_pool_)))); - } else { - return HeapObject::cast( - Object(Assembler::target_address_at(pc_, constant_pool_))); -@@ -187,7 +186,8 @@ Handle<HeapObject> RelocInfo::target_object_handle(Assembler* origin) { - } - } - --void RelocInfo::set_target_object(Tagged<HeapObject> target, -+void RelocInfo::set_target_object(Heap* heap, HeapObject target, -+ WriteBarrierMode write_barrier_mode, - ICacheFlushMode icache_flush_mode) { - DCHECK(IsCodeTarget(rmode_) || IsEmbeddedObjectMode(rmode_)); - if (IsCompressedEmbeddedObject(rmode_)) { -diff --git a/deps/v8/src/codegen/riscv/assembler-riscv.h b/deps/v8/src/codegen/riscv/assembler-riscv.h -index bcd5a62d324ee..ed222b52d6927 100644 ---- a/deps/v8/src/codegen/riscv/assembler-riscv.h -+++ b/deps/v8/src/codegen/riscv/assembler-riscv.h -@@ -286,7 +286,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBase, - // This is for calls and branches within generated code. The serializer - // has already deserialized the lui/ori instructions etc. - inline static void deserialization_set_special_target_at(Address location, -- Tagged<Code> code, -+ Code code, - Address target); - - // Get the size of the special target encoded at 'instruction_payload'. -diff --git a/deps/v8/src/execution/riscv/simulator-riscv.cc b/deps/v8/src/execution/riscv/simulator-riscv.cc -index 052a2d67dd7e4..9582db489638a 100644 ---- a/deps/v8/src/execution/riscv/simulator-riscv.cc -+++ b/deps/v8/src/execution/riscv/simulator-riscv.cc -@@ -1781,7 +1781,7 @@ void RiscvDebugger::Debug() { - sreg_t value; - StdoutStream os; - if (GetValue(arg1, &value)) { -- Tagged<Object> obj(value); -+ Object obj(value); - os << arg1 << ": \n"; - #ifdef DEBUG - obj.Print(os); -@@ -1830,7 +1830,7 @@ void RiscvDebugger::Debug() { - PrintF(" 0x%012" PRIxPTR " : 0x%016" REGIx_FORMAT - " %14" REGId_FORMAT " ", - reinterpret_cast<intptr_t>(cur), *cur, *cur); -- Tagged<Object> obj(*cur); -+ Object obj(*cur); - Heap* current_heap = sim_->isolate_->heap(); - if (obj.IsSmi() || - IsValidHeapObject(current_heap, HeapObject::cast(obj))) { -@@ -4692,7 +4692,7 @@ bool Simulator::DecodeRvvVS() { - Builtin Simulator::LookUp(Address pc) { - for (Builtin builtin = Builtins::kFirst; builtin <= Builtins::kLast; - ++builtin) { -- if (builtins_.code(builtin)->contains(isolate_, pc)) return builtin; -+ if (builtins_.code(builtin).contains(isolate_, pc)) return builtin; - } - return Builtin::kNoBuiltinId; - } -@@ -4709,7 +4709,7 @@ void Simulator::DecodeRVIType() { - if (builtin != Builtin::kNoBuiltinId) { - auto code = builtins_.code(builtin); - if ((rs1_reg() != ra || imm12() != 0)) { -- if ((Address)get_pc() == code->instruction_start()) { -+ if ((Address)get_pc() == code.InstructionStart()) { - sreg_t arg0 = get_register(a0); - sreg_t arg1 = get_register(a1); - sreg_t arg2 = get_register(a2); -diff --git a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc -index 72f89767eb348..4063b4b3d2194 100644 ---- a/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc -+++ b/deps/v8/src/regexp/riscv/regexp-macro-assembler-riscv.cc -@@ -1211,7 +1211,7 @@ static T* frame_entry_address(Address re_frame, int frame_offset) { - int64_t RegExpMacroAssemblerRISCV::CheckStackGuardState(Address* return_address, - Address raw_code, - Address re_frame) { -- Tagged<InstructionStream> re_code = InstructionStream::cast(Object(raw_code)); -+ InstructionStream re_code = InstructionStream::cast(Object(raw_code)); - return NativeRegExpMacroAssembler::CheckStackGuardState( - frame_entry<Isolate*>(re_frame, kIsolateOffset), - static_cast<int>(frame_entry<int64_t>(re_frame, kStartIndexOffset)), - diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml index a81beb28246a..aea2f7be0a47 100644 --- a/net-libs/nodejs/metadata.xml +++ b/net-libs/nodejs/metadata.xml @@ -13,7 +13,7 @@ <flag name="snapshot">Enable snapshot creation for faster startup</flag> <flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag> <flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag> - <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> + <flag name="systemtap">Enable SystemTap/DTrace tracing</flag> </use> <upstream> <remote-id type="github">nodejs/node</remote-id> diff --git a/net-libs/nodejs/nodejs-18.20.3.ebuild b/net-libs/nodejs/nodejs-18.20.3.ebuild deleted file mode 100644 index 33e59e2f721c..000000000000 --- a/net-libs/nodejs/nodejs-18.20.3.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.44.0:= - >=net-dns/c-ares-1.18.1:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) - sys-devel/gcc:*" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-debug/systemtap ) - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -# These are measured on a loong machine with -ggdb on, and only checked -# if debugging flags are present in CFLAGS. -# -# The final link consumed a little more than 7GiB alone, so 8GiB is the lower -# limit for memory usage. Disk usage was 19.1GiB for the build directory and -# 1.2GiB for the installed image, so we leave some room for architectures with -# fatter binaries and set the disk requirement to 22GiB. -CHECKREQS_MEMORY="8G" -CHECKREQS_DISK_BUILD="22G" - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." - - if [[ ${MERGE_TYPE} != "binary" ]]; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - fi -} - -pkg_setup() { - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-lto - # nodejs unconditionally links to libatomic #869992 - # specifically it requires __atomic_is_lock_free which - # is not yet implemented by sys-libs/compiler-rt (see - # https://reviews.llvm.org/D85044?id=287068), therefore - # we depend on gcc and force using libgcc as the support lib - tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use corepack || myconf+=( --without-corepack ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case "${ARCH}:${ABI}" in - *:amd64) myarch="x64";; - *:arm) myarch="arm";; - *:arm64) myarch="arm64";; - loong:lp64*) myarch="loong64";; - riscv:lp64*) myarch="riscv64";; - *:ppc64) myarch="ppc64";; - *:x32) myarch="x32";; - *:x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -Onone -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - keepdir /etc/npm - echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm - doenvd "${T}"/50npm - - # Install bash completion for `npm` - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - use corepack && - "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - local drop_tests=( - test/parallel/test-dns-resolveany.js - test/parallel/test-dns-resolveany-bad-ancount.js - test/parallel/test-dns-setserver-when-querying.js - test/parallel/test-fs-mkdir.js - test/parallel/test-fs-utimes-y2K38.js - test/parallel/test-release-npm.js - test/parallel/test-socket-write-after-fin-error.js - test/parallel/test-strace-openat-openssl.js - test/sequential/test-util-debug.js - ) - rm -f "${drop_tests[@]}" || die "disabling tests failed" - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} - -pkg_postinst() { - if use npm; then - ewarn "remember to run: source /etc/profile if you plan to use nodejs" - ewarn " in your current shell" - fi -} diff --git a/net-libs/nodejs/nodejs-18.20.1.ebuild b/net-libs/nodejs/nodejs-18.20.4.ebuild index 643af9340905..2e4b995390a1 100644 --- a/net-libs/nodejs/nodejs-18.20.1.ebuild +++ b/net-libs/nodejs/nodejs-18.20.4.ebuild @@ -4,7 +4,7 @@ EAPI=8 CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils @@ -24,7 +24,7 @@ else S="${WORKDIR}/node-v${PV}" fi -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -38,7 +38,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:= >=net-libs/nghttp2-1.41.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-67:= ) + system-icu? ( >=dev-libs/icu-73:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} @@ -242,6 +242,7 @@ src_test() { test/parallel/test-strace-openat-openssl.js test/sequential/test-util-debug.js ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die diff --git a/net-libs/nodejs/nodejs-20.12.1.ebuild b/net-libs/nodejs/nodejs-20.12.1.ebuild deleted file mode 100644 index 8d0580848c34..000000000000 --- a/net-libs/nodejs/nodejs-20.12.1.ebuild +++ /dev/null @@ -1,262 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/" -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node" - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl ) - x86? ( cpu_flags_x86_sse2 )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.46.0:= - >=net-dns/c-ares-1.18.1:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-71:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) - sys-devel/gcc:*" -BDEPEND="${PYTHON_DEPS} - app-alternatives/ninja - sys-apps/coreutils - virtual/pkgconfig - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -# These are measured on a loong machine with -ggdb on, and only checked -# if debugging flags are present in CFLAGS. -# -# The final link consumed a little more than 7GiB alone, so 8GiB is the lower -# limit for memory usage. Disk usage was 19.1GiB for the build directory and -# 1.2GiB for the installed image, so we leave some room for architectures with -# fatter binaries and set the disk requirement to 22GiB. -CHECKREQS_MEMORY="8G" -CHECKREQS_DISK_BUILD="22G" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - fi -} - -pkg_setup() { - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - BUILDTYPE=Debug - fi - - # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) - - # bug 922725 - use riscv && PATCHES+=( "${FILESDIR}"/${PN}-20.11.0-riscv.patch ) - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-lto - # nodejs unconditionally links to libatomic #869992 - # specifically it requires __atomic_is_lock_free which - # is not yet implemented by sys-libs/compiler-rt (see - # https://reviews.llvm.org/D85044?id=287068), therefore - # we depend on gcc and force using libgcc as the support lib - tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" - - local myconf=( - --ninja - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - if use system-icu; then - myconf+=( --with-intl=system-icu ) - elif use icu; then - myconf+=( --with-intl=full-icu ) - else - myconf+=( --with-intl=none ) - fi - use corepack || myconf+=( --without-corepack ) - use inspector || myconf+=( --without-inspector ) - use npm || myconf+=( --without-npm ) - use snapshot || myconf+=( --without-node-snapshot ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case "${ARCH}:${ABI}" in - *:amd64) myarch="x64";; - *:arm) myarch="arm";; - *:arm64) myarch="arm64";; - loong:lp64*) myarch="loong64";; - riscv:lp64*) myarch="riscv64";; - *:ppc64) myarch="ppc64";; - *:x32) myarch="x32";; - *:x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - "${myconf[@]}" || die -} - -src_compile() { - emake -Onone -} - -src_install() { - local LIBDIR="${ED}/usr/$(get_libdir)" - default - - pax-mark -m "${ED}"/usr/bin/node - - # set up a symlink structure that node-gyp expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - keepdir /etc/npm - echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm - doenvd "${T}"/50npm - - # Install bash completion for `npm` - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - use corepack && - "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - local drop_tests=( - test/parallel/test-dns-resolveany-bad-ancount.js - test/parallel/test-dns-setserver-when-querying.js - test/parallel/test-fs-mkdir.js - test/parallel/test-fs-read-stream.js - test/parallel/test-fs-utimes-y2K38.js - test/parallel/test-fs-watch-recursive-add-file.js - test/parallel/test-process-euid-egid.js - test/parallel/test-process-initgroups.js - test/parallel/test-process-setgroups.js - test/parallel/test-process-uid-gid.js - test/parallel/test-release-npm.js - test/parallel/test-socket-write-after-fin-error.js - test/parallel/test-strace-openat-openssl.js - test/sequential/test-util-debug.js - ) - rm -f "${drop_tests[@]}" || die "disabling tests failed" - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -} - -pkg_postinst() { - if use npm; then - ewarn "remember to run: source /etc/profile if you plan to use nodejs" - ewarn " in your current shell" - fi -} diff --git a/net-libs/nodejs/nodejs-20.14.0.ebuild b/net-libs/nodejs/nodejs-20.15.1.ebuild index 5ad9958a8c0e..79e4dcce8bc0 100644 --- a/net-libs/nodejs/nodejs-20.14.0.ebuild +++ b/net-libs/nodejs/nodejs-20.15.1.ebuild @@ -7,7 +7,7 @@ CONFIG_CHECK="~ADVISE_SYSCALLS" PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi @@ -40,7 +40,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:= >=net-libs/ngtcp2-1.1.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-71:= ) + system-icu? ( >=dev-libs/icu-73:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} @@ -169,6 +169,7 @@ src_configure() { } src_compile() { + export NINJA_ARGS=$(get_NINJAOPTS) emake -Onone } @@ -247,6 +248,7 @@ src_test() { test/parallel/test-strace-openat-openssl.js test/sequential/test-util-debug.js ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die diff --git a/net-libs/nodejs/nodejs-20.15.0.ebuild b/net-libs/nodejs/nodejs-20.17.0.ebuild index 1ce818bc4013..44f8a7a5ea5b 100644 --- a/net-libs/nodejs/nodejs-20.15.0.ebuild +++ b/net-libs/nodejs/nodejs-20.17.0.ebuild @@ -7,7 +7,7 @@ CONFIG_CHECK="~ADVISE_SYSCALLS" PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -20,11 +20,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -40,7 +40,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:= >=net-libs/ngtcp2-1.1.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-71:= ) + system-icu? ( >=dev-libs/icu-73:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} @@ -169,6 +169,7 @@ src_configure() { } src_compile() { + export NINJA_ARGS=" $(get_NINJAOPTS) " emake -Onone } @@ -232,13 +233,15 @@ src_install() { src_test() { local drop_tests=( - test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns.js + test/parallel/test-dns-resolveany-bad-ancount.js test/parallel/test-dns-setserver-when-querying.js test/parallel/test-fs-mkdir.js test/parallel/test-fs-read-stream.js test/parallel/test-fs-utimes-y2K38.js test/parallel/test-fs-watch-recursive-add-file.js test/parallel/test-process-euid-egid.js + test/parallel/test-process-get-builtin.mjs test/parallel/test-process-initgroups.js test/parallel/test-process-setgroups.js test/parallel/test-process-uid-gid.js @@ -247,6 +250,8 @@ src_test() { test/parallel/test-strace-openat-openssl.js test/sequential/test-util-debug.js ) + use inspector || drop_tests+=( test/sequential/test-watch-mode.mjs ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die diff --git a/net-libs/nodejs/nodejs-22.4.0.ebuild b/net-libs/nodejs/nodejs-22.4.1-r1.ebuild index 87f095c8c487..c18f06e68056 100644 --- a/net-libs/nodejs/nodejs-22.4.0.ebuild +++ b/net-libs/nodejs/nodejs-22.4.1-r1.ebuild @@ -4,10 +4,10 @@ EAPI=8 CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi @@ -42,7 +42,7 @@ RDEPEND=">=app-arch/brotli-1.0.9:= >=net-libs/ngtcp2-1.3.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-71:= ) + system-icu? ( >=dev-libs/icu-73:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} @@ -106,7 +106,7 @@ src_prepare() { use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) # bug 931256 - use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.patch ) + use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch ) default } @@ -116,6 +116,10 @@ src_configure() { # LTO compiler flags are handled by configure.py itself filter-lto + # GCC with -ftree-vectorize miscompiles node's exception handling code + # causing it to fail to catch exceptions sometimes + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057 + tc-is-gcc && append-cxxflags -fno-tree-vectorize # nodejs unconditionally links to libatomic #869992 # specifically it requires __atomic_is_lock_free which # is not yet implemented by sys-libs/compiler-rt (see @@ -182,6 +186,7 @@ src_configure() { } src_compile() { + export NINJA_ARGS=" $(get_NINJAOPTS)" emake -Onone } @@ -262,6 +267,9 @@ src_test() { test/parallel/test-strace-openat-openssl.js test/sequential/test-util-debug.js ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) + [[ $(tc-get-ptr-size) == 4 ]] && drop_tests+=( test/sequential/test-watch-mode.mjs ) + use inspector || drop_tests+=( test/sequential/test-watch-mode.mjs ) rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die @@ -271,6 +279,6 @@ src_test() { pkg_postinst() { if use npm; then ewarn "remember to run: source /etc/profile if you plan to use nodejs" - ewarn " in your current shell" + ewarn " in your current shell" fi } diff --git a/net-libs/nodejs/nodejs-22.3.0.ebuild b/net-libs/nodejs/nodejs-22.7.0.ebuild index 306ba6b072c8..bc4c9333bb81 100644 --- a/net-libs/nodejs/nodejs-22.3.0.ebuild +++ b/net-libs/nodejs/nodejs-22.7.0.ebuild @@ -4,10 +4,10 @@ EAPI=8 CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -20,11 +20,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -34,15 +34,19 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= + dev-db/sqlite:3 >=dev-libs/libuv-1.46.0:= + >=dev-libs/simdjson-3.9.1:= >=net-dns/c-ares-1.18.1:= >=net-libs/nghttp2-1.61.0:= - >=net-libs/ngtcp2-1.3.0:= - >=dev-libs/simdjson-3.9.1:= sys-libs/zlib corepack? ( !sys-apps/yarn ) - system-icu? ( >=dev-libs/icu-71:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-icu? ( >=dev-libs/icu-73:= ) + system-ssl? ( + >=net-libs/ngtcp2-1.3.0:= + >=dev-libs/openssl-1.1.1:0= + ) + !system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] ) sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} app-alternatives/ninja @@ -105,7 +109,7 @@ src_prepare() { use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) # bug 931256 - use riscv && PATCHES+=( "${FILESDIR}"/${P}-riscv.patch ) + use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch ) default } @@ -115,6 +119,10 @@ src_configure() { # LTO compiler flags are handled by configure.py itself filter-lto + # GCC with -ftree-vectorize miscompiles node's exception handling code + # causing it to fail to catch exceptions sometimes + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057 + tc-is-gcc && append-cxxflags -fno-tree-vectorize # nodejs unconditionally links to libatomic #869992 # specifically it requires __atomic_is_lock_free which # is not yet implemented by sys-libs/compiler-rt (see @@ -136,6 +144,7 @@ src_configure() { # sindutf is not packaged yet # https://github.com/simdutf/simdutf # --shared-simdutf + --shared-sqlite --shared-zlib ) use debug && myconf+=( --debug ) @@ -180,6 +189,7 @@ src_configure() { } src_compile() { + export NINJA_ARGS=" $(get_NINJAOPTS)" emake -Onone } @@ -243,13 +253,15 @@ src_install() { src_test() { local drop_tests=( - test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns.js + test/parallel/test-dns-resolveany-bad-ancount.js test/parallel/test-dns-setserver-when-querying.js test/parallel/test-fs-mkdir.js test/parallel/test-fs-read-stream.js test/parallel/test-fs-utimes-y2K38.js test/parallel/test-fs-watch-recursive-add-file.js test/parallel/test-process-euid-egid.js + test/parallel/test-process-get-builtin.mjs test/parallel/test-process-initgroups.js test/parallel/test-process-setgroups.js test/parallel/test-process-uid-gid.js @@ -258,6 +270,13 @@ src_test() { test/parallel/test-strace-openat-openssl.js test/sequential/test-util-debug.js ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) + use inspector || + drop_tests+=( + test/parallel/test-inspector-emit-protocol-event.js + test/parallel/test-inspector-network-domain.js + test/sequential/test-watch-mode.mjs + ) rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die @@ -267,6 +286,6 @@ src_test() { pkg_postinst() { if use npm; then ewarn "remember to run: source /etc/profile if you plan to use nodejs" - ewarn " in your current shell" + ewarn " in your current shell" fi } diff --git a/net-libs/nodejs/nodejs-22.8.0.ebuild b/net-libs/nodejs/nodejs-22.8.0.ebuild new file mode 100644 index 000000000000..2c68aa6262a1 --- /dev/null +++ b/net-libs/nodejs/nodejs-22.8.0.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CONFIG_CHECK="~ADVISE_SYSCALLS" +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" +HOMEPAGE="https://nodejs.org/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl ) + x86? ( cpu_flags_x86_sse2 )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + dev-db/sqlite:3 + >=dev-libs/libuv-1.46.0:= + >=dev-libs/simdjson-3.9.1:= + >=net-dns/c-ares-1.18.1:= + >=net-libs/nghttp2-1.61.0:= + sys-libs/zlib + corepack? ( !sys-apps/yarn ) + system-icu? ( >=dev-libs/icu-73:= ) + system-ssl? ( + >=net-libs/ngtcp2-1.3.0:= + >=dev-libs/openssl-1.1.1:0= + ) + !system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] ) + sys-devel/gcc:*" +BDEPEND="${PYTHON_DEPS} + app-alternatives/ninja + sys-apps/coreutils + virtual/pkgconfig + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +# These are measured on a loong machine with -ggdb on, and only checked +# if debugging flags are present in CFLAGS. +# +# The final link consumed a little more than 7GiB alone, so 8GiB is the lower +# limit for memory usage. Disk usage was 19.1GiB for the build directory and +# 1.2GiB for the installed image, so we leave some room for architectures with +# fatter binaries and set the disk requirement to 22GiB. +CHECKREQS_MEMORY="8G" +CHECKREQS_DISK_BUILD="22G" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + einfo "Checking for sufficient disk space and memory to build ${PN} with debugging CFLAGS" + check-reqs_pkg_pretend + fi + fi +} + +pkg_setup() { + python-any-r1_pkg_setup + linux-info_pkg_setup +} + +src_prepare() { + tc-export AR CC CXX PKG_CONFIG + export V=1 + export BUILDTYPE=Release + + # fix compilation on Darwin + # https://code.google.com/p/gyp/issues/detail?id=260 + sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die + + # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 + local LIBDIR=$(get_libdir) + sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die + sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die + + # Avoid writing a depfile, not useful + sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die + + sed -i -e "/'-O3'/d" common.gypi node.gypi || die + + # debug builds. change install path, remove optimisations and override buildtype + if use debug; then + sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die + BUILDTYPE=Debug + fi + + # We need to disable mprotect on two files when it builds Bug 694100. + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + # bug 931256 + use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch ) + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-lto + # GCC with -ftree-vectorize miscompiles node's exception handling code + # causing it to fail to catch exceptions sometimes + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057 + tc-is-gcc && append-cxxflags -fno-tree-vectorize + # nodejs unconditionally links to libatomic #869992 + # specifically it requires __atomic_is_lock_free which + # is not yet implemented by sys-libs/compiler-rt (see + # https://reviews.llvm.org/D85044?id=287068), therefore + # we depend on gcc and force using libgcc as the support lib + tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" + + local myconf=( + --ninja + # ada is not packaged yet + # https://github.com/ada-url/ada + # --shared-ada + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-ngtcp2 + --shared-simdjson + # sindutf is not packaged yet + # https://github.com/simdutf/simdutf + # --shared-simdutf + --shared-sqlite + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use corepack || myconf+=( --without-corepack ) + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + local myarch="" + case "${ARCH}:${ABI}" in + *:amd64) myarch="x64";; + *:arm) myarch="arm";; + *:arm64) myarch="arm64";; + loong:lp64*) myarch="loong64";; + riscv:lp64*) myarch="riscv64";; + *:ppc64) myarch="ppc64";; + *:x32) myarch="x32";; + *:x86) myarch="ia32";; + *) myarch="${ABI}";; + esac + + GYP_DEFINES="linux_use_gold_flags=0 + linux_use_bundled_binutils=0 + linux_use_bundled_gold=0" \ + "${EPYTHON}" configure.py \ + --prefix="${EPREFIX}"/usr \ + --dest-cpu=${myarch} \ + "${myconf[@]}" || die +} + +src_compile() { + export NINJA_ARGS=" $(get_NINJAOPTS)" + emake -Onone +} + +src_install() { + local LIBDIR="${ED}/usr/$(get_libdir)" + default + + pax-mark -m "${ED}"/usr/bin/node + + # set up a symlink structure that node-gyp expects.. + dodir /usr/include/node/deps/{v8,uv} + dosym . /usr/include/node/src + for var in deps/{uv,v8}/include; do + dosym ../.. /usr/include/node/${var} + done + + if use doc; then + docinto html + dodoc -r "${S}"/doc/* + fi + + if use npm; then + keepdir /etc/npm + echo "NPM_CONFIG_GLOBALCONFIG=${EPREFIX}/etc/npm/npmrc" > "${T}"/50npm + doenvd "${T}"/50npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + local find_exp="-or -name" + local find_name=() + for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ + ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ + "*.md" "*.markdown" "*.bat" "*.cmd"; do + find_name+=( ${find_exp} "${match}" ) + done + + # Remove various development and/or inappropriate files and + # useless docs of dependend packages. + find "${LIBDIR}"/node_modules \ + \( -type d -name examples \) -or \( -type f \( \ + -iname "LICEN?E*" \ + "${find_name[@]}" \ + \) \) -exec rm -rf "{}" \; + fi + + use corepack && + "${D}"/usr/bin/corepack enable --install-directory "${D}"/usr/bin + + mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die +} + +src_test() { + local drop_tests=( + test/parallel/test-dns.js + test/parallel/test-dns-resolveany-bad-ancount.js + test/parallel/test-dns-setserver-when-querying.js + test/parallel/test-fs-mkdir.js + test/parallel/test-fs-read-stream.js + test/parallel/test-fs-utimes-y2K38.js + test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-process-euid-egid.js + test/parallel/test-process-get-builtin.mjs + test/parallel/test-process-initgroups.js + test/parallel/test-process-setgroups.js + test/parallel/test-process-uid-gid.js + test/parallel/test-release-npm.js + test/parallel/test-socket-write-after-fin-error.js + test/parallel/test-strace-openat-openssl.js + test/sequential/test-util-debug.js + ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) + use inspector || + drop_tests+=( + test/parallel/test-inspector-emit-protocol-event.js + test/parallel/test-inspector-network-domain.js + test/sequential/test-watch-mode.mjs + ) + rm -f "${drop_tests[@]}" || die "disabling tests failed" + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} + +pkg_postinst() { + if use npm; then + ewarn "remember to run: source /etc/profile if you plan to use nodejs" + ewarn " in your current shell" + fi +} diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 8f647b977a19..2c68aa6262a1 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -4,10 +4,10 @@ EAPI=8 CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 check-reqs flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils +inherit bash-completion-r1 check-reqs flag-o-matic linux-info ninja-utils pax-utils python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/" @@ -24,9 +24,8 @@ else S="${WORKDIR}/node-v${PV}" fi -IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" -REQUIRED_USE="corepack? ( !npm ) - inspector? ( icu ssl ) +IUSE="corepack cpu_flags_x86_sse2 debug doc +icu inspector lto npm pax-kernel +snapshot +ssl +system-icu +system-ssl test" +REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) system-ssl? ( ssl ) @@ -35,13 +34,19 @@ REQUIRED_USE="corepack? ( !npm ) RESTRICT="!test? ( test )" RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.44.0:= + dev-db/sqlite:3 + >=dev-libs/libuv-1.46.0:= + >=dev-libs/simdjson-3.9.1:= >=net-dns/c-ares-1.18.1:= - >=net-libs/nghttp2-1.41.0:= + >=net-libs/nghttp2-1.61.0:= sys-libs/zlib corepack? ( !sys-apps/yarn ) system-icu? ( >=dev-libs/icu-73:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) + system-ssl? ( + >=net-libs/ngtcp2-1.3.0:= + >=dev-libs/openssl-1.1.1:0= + ) + !system-ssl? ( >=net-libs/ngtcp2-1.3.0:=[-gnutls] ) sys-devel/gcc:*" BDEPEND="${PYTHON_DEPS} app-alternatives/ninja @@ -84,9 +89,6 @@ src_prepare() { # https://code.google.com/p/gyp/issues/detail?id=260 sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 local LIBDIR=$(get_libdir) sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die @@ -104,7 +106,10 @@ src_prepare() { fi # We need to disable mprotect on two files when it builds Bug 694100. - use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-18.16.0-paxmarking.patch ) + use pax-kernel && PATCHES+=( "${FILESDIR}"/${PN}-20.6.0-paxmarking.patch ) + + # bug 931256 + use riscv && PATCHES+=( "${FILESDIR}"/${PN}-22.2.0-riscv.patch ) default } @@ -114,6 +119,10 @@ src_configure() { # LTO compiler flags are handled by configure.py itself filter-lto + # GCC with -ftree-vectorize miscompiles node's exception handling code + # causing it to fail to catch exceptions sometimes + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116057 + tc-is-gcc && append-cxxflags -fno-tree-vectorize # nodejs unconditionally links to libatomic #869992 # specifically it requires __atomic_is_lock_free which # is not yet implemented by sys-libs/compiler-rt (see @@ -123,10 +132,19 @@ src_configure() { local myconf=( --ninja + # ada is not packaged yet + # https://github.com/ada-url/ada + # --shared-ada --shared-brotli --shared-cares --shared-libuv --shared-nghttp2 + --shared-ngtcp2 + --shared-simdjson + # sindutf is not packaged yet + # https://github.com/simdutf/simdutf + # --shared-simdutf + --shared-sqlite --shared-zlib ) use debug && myconf+=( --debug ) @@ -171,6 +189,7 @@ src_configure() { } src_compile() { + export NINJA_ARGS=" $(get_NINJAOPTS)" emake -Onone } @@ -234,15 +253,30 @@ src_install() { src_test() { local drop_tests=( + test/parallel/test-dns.js + test/parallel/test-dns-resolveany-bad-ancount.js test/parallel/test-dns-setserver-when-querying.js test/parallel/test-fs-mkdir.js + test/parallel/test-fs-read-stream.js test/parallel/test-fs-utimes-y2K38.js test/parallel/test-fs-watch-recursive-add-file.js + test/parallel/test-process-euid-egid.js + test/parallel/test-process-get-builtin.mjs + test/parallel/test-process-initgroups.js + test/parallel/test-process-setgroups.js + test/parallel/test-process-uid-gid.js test/parallel/test-release-npm.js test/parallel/test-socket-write-after-fin-error.js test/parallel/test-strace-openat-openssl.js test/sequential/test-util-debug.js ) + [[ "$(nice)" -gt 10 ]] && drop_tests+=( "test/parallel/test-os.js" ) + use inspector || + drop_tests+=( + test/parallel/test-inspector-emit-protocol-event.js + test/parallel/test-inspector-network-domain.js + test/sequential/test-watch-mode.mjs + ) rm -f "${drop_tests[@]}" || die "disabling tests failed" out/${BUILDTYPE}/cctest || die @@ -252,6 +286,6 @@ src_test() { pkg_postinst() { if use npm; then ewarn "remember to run: source /etc/profile if you plan to use nodejs" - ewarn " in your current shell" + ewarn " in your current shell" fi } |