diff options
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/Manifest.gz | bin | 22123 -> 22128 bytes | |||
-rw-r--r-- | dev-lang/rust-bin/Manifest | 19 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild | 15 | ||||
-rw-r--r-- | dev-lang/rust-bin/rust-bin-1.83.0.ebuild | 2 | ||||
-rw-r--r-- | dev-lang/zig/Manifest | 4 | ||||
-rw-r--r-- | dev-lang/zig/files/zig-0.13.0-skip-test-stack_iterator.patch | 32 | ||||
-rw-r--r-- | dev-lang/zig/zig-0.13.0-r2.ebuild | 248 | ||||
-rw-r--r-- | dev-lang/zig/zig-9999.ebuild | 235 |
15 files changed, 431 insertions, 229 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex ee0df369b880..a73814e98d35 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index b48730479a6e..8130fc2e6fa3 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -323,6 +323,7 @@ DIST rust-1.83.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B bd67bf4a611f DIST rust-1.83.0-powerpc64-unknown-linux-musl.tar.xz 67433444 BLAKE2B 0f1426eb3f60cb1f731b8e35f20a6711e6a900413480bc33a1f7da9ddfea26e947a33c9162ce78ab6a3623bff8aa83d0aa27b82109b22b201fff8482c3b480fc SHA512 d3e17f4a35062be865e29169e41ba93b3f8fb78b73bbe50a9330ecac29442c8d1ad6e68ba1422585e49a09de215cc7fb9d6d798c3aa60c8211f4a88fae3c32da DIST rust-1.83.0-powerpc64le-unknown-linux-gnu.tar.xz 231986816 BLAKE2B daf72e5a6382ec93d7222b624ebc8c2f27d4b4a0448ad227615f4f7c9e8d87b2d2a7c182d6f0f61a20b4f737e5f70467a0c2b6024eeeeb248cbfb37d655841f7 SHA512 6735080308340072dc3f258b755889c7a9f6e79b85c46e38de074823b6814289b1f9862a1ac69d3027386560ffe3c2eab339438a536e717f7b099f0de75b6b64 DIST rust-1.83.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7c88fadadd58fb4e2c63f10f01b1b3b719e1917f5c1217b5a858bf347483f0b71016107045f34916fa53e493b47532a94148c4fe95db6ec23222e8e6f70dd98f SHA512 da5e64c245bc962447384db3876f3d3724ebddacddf35b7fa47e2e7b408ffaaffe303549fba9c07af8a6974ba32da823989d1929068e0eb5c781881511012a6f +DIST rust-1.83.0-powerpc64le-unknown-linux-musl.tar.xz 69860332 BLAKE2B 63a29db5bf9b1664fa95a902c222430b1a38b6dd8e4093333bc65f0807023fcd20566654df2b666eb7729c4053c4ee848ca1cbdea8e47afa08fd391a515d51df SHA512 6ba407ddfc00c6e06365e014b7cdd54ac5b529d998c5c743ca5fe70f2da20c2067182e9fef1c4d43934d8fe9b87a73bcc48f3514da3c0f0ad07e09e4b9922eb8 DIST rust-1.83.0-riscv64gc-unknown-linux-gnu.tar.xz 218315040 BLAKE2B 91139066f3ac6a652db13985a225547eed242a6efaab0021bcf78b31e9e98fbedcdfe932110fa4c918f5eb3d8336b9b41a15dc2fcd316561d56e5bf205dd1567 SHA512 9bc1b82aff2e2447cb16680a8125378e33b7ceff4fdae7855bd7a79437f2df5b3989e82ffd68f157d50144018a74e6cc2053bda21de31d2c694aef29bf4e8bfc DIST rust-1.83.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B e51ec506c4897e5e57cc94bfd3ba15d64e678a67b50acf48b8c69a5b95223006451d543275fc5291bb69369bead17a01d4934cda5b4744adfae2423200a002d0 SHA512 2d705740d928d49bd0eafe26cccf997f81c1f7ddd72bf6c4a4abe89e1984dca8e1b57af4b997939df355dea19abea2f45d430edafe88e7bb207abc0dc8d8ce3d DIST rust-1.83.0-s390x-unknown-linux-gnu.tar.xz 221194604 BLAKE2B 5d625e48296c171fe6da8ec70fa4daaf1632f6b63404d30ca0e908d63fcac3abc39f6fd9762d3670aa94f9a2587202d1b66f9751fd04e5e99f00caf8748243d6 SHA512 3aece2baaf66134ca339f3a9239c92ab7969c064eb35ede5dd61a3c2eca5eee4053b581edaab0acd6ba60cb7600b47902697e71c41873357fd53dbbe5c867d8b @@ -343,20 +344,20 @@ DIST rust-src-1.82.0.tar.xz 2966368 BLAKE2B 4162e7393ac21a095ac1541ea7b62fafa561 DIST rust-src-1.83.0.tar.xz 2998424 BLAKE2B de758c5bfb29865a3ab7ab02d17b0282272fa7d1cf5da333a6a19d6a16813320317785e9bab02e3ba9ca6ee9f26e0c96b00a117f33b74c82b13ece44133e3130 SHA512 e1f0ccae1fd4202d86cde1f1e2f4491983ec49fafb2b9eaca6260e9173bea0e0cc2567946e48e3ce48f0a620f63dc44d30334f06c935628158de110d43c7d53b EBUILD rust-bin-1.54.0.ebuild 5533 BLAKE2B d6e9c37a4ba322c4fa86d658eb3517a3c45bfa3341869ffb040c6ca350c16a892f26abe3c51cdea52d42c453a837f3204256285170729ae301d16e63db8bb8d4 SHA512 7ed26906372c87134263d00cecd62ad51731a906529eb23765dbca78efd921f1713d23d2f46ee0f2a5a2cedc2554fa60749b25f3a23f9a030821b90d7999adcf EBUILD rust-bin-1.71.1-r100.ebuild 7172 BLAKE2B f8b6f4910cf00212f0d7288d10d29c72d88826728fddfc77f47a782103564a88252837931c699ea9cf7586e4d9507bdae2a3354df262414c368af95a2d0bbfb8 SHA512 24aa046084a58816a2d3a949826945e294ab2ddacbc1e2ccb4cf1914065f3e52f7c3f680330939194b29149a3384c711efa09a261277d4b2dec6aff6660142a9 -EBUILD rust-bin-1.71.1-r101.ebuild 7617 BLAKE2B 379c9c36fcdea84d23f6575b94140f5398fbcd109bda4317852c51316e9db8d15b236631b6c90214095173e3ffcf0ba40bbb4d00a9e3da1c105915bf985f8131 SHA512 d5d0107e9d207538a9add1cce4b2fecf29fed0c196d34df9e1229b64d2562a54fa193061ad2fdc1af1c1280e2290f1dceb9200163329c08e3b14fe9b796ec28e +EBUILD rust-bin-1.71.1-r101.ebuild 7172 BLAKE2B f8b6f4910cf00212f0d7288d10d29c72d88826728fddfc77f47a782103564a88252837931c699ea9cf7586e4d9507bdae2a3354df262414c368af95a2d0bbfb8 SHA512 24aa046084a58816a2d3a949826945e294ab2ddacbc1e2ccb4cf1914065f3e52f7c3f680330939194b29149a3384c711efa09a261277d4b2dec6aff6660142a9 EBUILD rust-bin-1.74.1-r100.ebuild 7515 BLAKE2B eabe846ec482e04cfe068420c8315eead88dbe229bedf5f2809b492dc360bf5f34023c89a68b62d1f92c5a3ba628bfd8c861e83980925f74c61d95d3f106db2e SHA512 e40c66befee2c16b579b630de2e0aae00eb5bd72680bd6ee724ab52f434dfc725b2c377d725d95a3500be818acad973202e9b802762adcb1b54cab0251280d2b -EBUILD rust-bin-1.74.1-r101.ebuild 7960 BLAKE2B c90f735cd67e562ed092cb56c02b3af400cb114a7be00f99c61626425fef21e82ca55187e94dff57d702e97437816d2c57a304437af9710559bc3b60be3d870a SHA512 433339eaab6466f079af5ca5a154dc8fbcc9a4df59cda349aa5fe1985eebd0174ea1f89dab40af85eef13c31576c7468e49c792e08123549cabbd12115065f47 +EBUILD rust-bin-1.74.1-r101.ebuild 7515 BLAKE2B eabe846ec482e04cfe068420c8315eead88dbe229bedf5f2809b492dc360bf5f34023c89a68b62d1f92c5a3ba628bfd8c861e83980925f74c61d95d3f106db2e SHA512 e40c66befee2c16b579b630de2e0aae00eb5bd72680bd6ee724ab52f434dfc725b2c377d725d95a3500be818acad973202e9b802762adcb1b54cab0251280d2b EBUILD rust-bin-1.75.0-r100.ebuild 7515 BLAKE2B fdf3b9befaf1983494e42fe9ad17eb52dd14b0551f113a0d7d276dde05402d53d0d59a9ff1547e6df22e12a7845bda581239badeb5d80bcb144201d473227042 SHA512 88b9790f929d48440533b82aa9fe3300ecce75ca74f517076186a1cff3cf360aaa38f06b454ad93b429dfbf69e482af0add2ae1ca9ed1ee8e085ba9b3ea0eecf -EBUILD rust-bin-1.75.0-r101.ebuild 7960 BLAKE2B 6e7c62bdf14000ea9fb286929935b0d7b02a1d7169edbd2d3b22696f76ad064ce47569cb86015e57d451629d7fe1edf8a43cf60c1e82e284e8712531a5dc0118 SHA512 19e1f54a2e66e55a5462c038c31cd249ce4ed9fbb59a3e356ccf29c0f7dad7302d30408d01e8ab4e6fa5889102c5bf040218de339fc4a6b3d0dda8a9449caf29 +EBUILD rust-bin-1.75.0-r101.ebuild 7515 BLAKE2B fdf3b9befaf1983494e42fe9ad17eb52dd14b0551f113a0d7d276dde05402d53d0d59a9ff1547e6df22e12a7845bda581239badeb5d80bcb144201d473227042 SHA512 88b9790f929d48440533b82aa9fe3300ecce75ca74f517076186a1cff3cf360aaa38f06b454ad93b429dfbf69e482af0add2ae1ca9ed1ee8e085ba9b3ea0eecf EBUILD rust-bin-1.77.1-r100.ebuild 7554 BLAKE2B f758b72f8e36eb8dfb9df428344e6bbf445dc3fcab2f1aa30712c957e3fba85d283277790f39f7fd1270bdbf576ece89bc148cca2defbcc312b2863403122404 SHA512 b3effcf3c371c52f0c6d6f82c3ebf712bade202d2e8df45d886ee6077b3b0e5cb5fb102f55743ea13795b1a0c4a79e093c5a0e9bfb0c8127961d5779e0a21be4 -EBUILD rust-bin-1.77.1-r101.ebuild 7999 BLAKE2B 4ee63b8519d0f3c784555dea82266e4eed706465c5ba813565b6e5487c52b65879389d72eae3f33e6d32972eb52d3b3a3faf7637d95d4f17a542985986aec127 SHA512 168e0da0fca0c088e69beccb993cfd368c58dd6877329fffc63d8192cb850d14d1078d5a3a2959f4b675409046df7971ebbffb7db7ce0d780f2d9d21e5f9d168 +EBUILD rust-bin-1.77.1-r101.ebuild 7554 BLAKE2B f758b72f8e36eb8dfb9df428344e6bbf445dc3fcab2f1aa30712c957e3fba85d283277790f39f7fd1270bdbf576ece89bc148cca2defbcc312b2863403122404 SHA512 b3effcf3c371c52f0c6d6f82c3ebf712bade202d2e8df45d886ee6077b3b0e5cb5fb102f55743ea13795b1a0c4a79e093c5a0e9bfb0c8127961d5779e0a21be4 EBUILD rust-bin-1.79.0-r100.ebuild 7661 BLAKE2B 0c003da9b7ef5b5fe204735836da0e2c0bac283486eb0382defe27598f9a0ea0e38dd67e57d4fa90567f8ce6f4e59602d6b2d1afe83f582b2eb8e0da9e5d14fc SHA512 1434345f981e692f50840d27140e8a8e9b2d9eb557e7250f032db02321d839fde70609399645ae38f2e78cf79049eabf447d96340c43cb03891a186d1fe07439 -EBUILD rust-bin-1.79.0-r101.ebuild 8106 BLAKE2B 33d7c323da4b6b76a66e25e4045e25865198be11b654ea1df1a0f64a7a3efd4729c20e43b804cf398c7990baddfeb43f21ff5c47e872c63c37e864c5761e9b37 SHA512 79942d40eb7c7b2aeb248184acc2082d29cf392a84814dbaf975eaba9c42de41b6f46c093225bc3dbaee9ac127199d4e3742f7a16af9bcda6f51d06874e8468b +EBUILD rust-bin-1.79.0-r101.ebuild 7661 BLAKE2B 0c003da9b7ef5b5fe204735836da0e2c0bac283486eb0382defe27598f9a0ea0e38dd67e57d4fa90567f8ce6f4e59602d6b2d1afe83f582b2eb8e0da9e5d14fc SHA512 1434345f981e692f50840d27140e8a8e9b2d9eb557e7250f032db02321d839fde70609399645ae38f2e78cf79049eabf447d96340c43cb03891a186d1fe07439 EBUILD rust-bin-1.80.1-r100.ebuild 7870 BLAKE2B 335d40c75cd61578b055a6ad5d03a182304bfb94b8df09503a802fda905e9c40cfa968e138fb6170734339e5af3d1794b38600b9df6b25abdd5c5a40d4d5637d SHA512 b7dd088309c9da903b1ed24d94c2ac697c1c800ed1c5708572afa5ac3497636811efc5123c390b545e8100a5a8140dc9a49a682ac43fac4821e52c7e8528dad4 -EBUILD rust-bin-1.80.1-r101.ebuild 8315 BLAKE2B ef52333fab8659865cfd88d79b5f0dd279133e68ea7db91e744e9666b0b5eefb99448ccbd94486784e5f7e1073589e6f4bf11e55564075cf1917f53bfcb33bd1 SHA512 337fd21610175f22beab257e4e01c891597cf4e5e9989da67462ccf51cf83b777adaeab5a038b63278940a65e826171d6140c34aa69251917885610ea467a70f +EBUILD rust-bin-1.80.1-r101.ebuild 7870 BLAKE2B 335d40c75cd61578b055a6ad5d03a182304bfb94b8df09503a802fda905e9c40cfa968e138fb6170734339e5af3d1794b38600b9df6b25abdd5c5a40d4d5637d SHA512 b7dd088309c9da903b1ed24d94c2ac697c1c800ed1c5708572afa5ac3497636811efc5123c390b545e8100a5a8140dc9a49a682ac43fac4821e52c7e8528dad4 EBUILD rust-bin-1.81.0-r100.ebuild 7796 BLAKE2B d4fa84b38416621e531c0fa8721d7d4c351da246324a691cceaebcc8379c5c9003dc5a0c95353b94ab8b1ab1905fb9578d3d951d1c8a986dd720d2282ac76b12 SHA512 4972eef30629e93301d931f56354008a1184acf209740d1cfde93440023e9ca0c8ffb4d7c218ab6930724b827a796f102d56eef73feb378f3be5a7eafe55cf35 -EBUILD rust-bin-1.81.0-r101.ebuild 8241 BLAKE2B 6016e24b820794e496fc0963d5750dba187b4e1f6a397e0759d7c9fe40b61d27a4aa081bb235e3d9ed1905384ffbeb0e8937c4fc54b935bf826912122fdddfdb SHA512 f0044a99e3b43426fd9c314b4ec6629c4567a3979fcabb4bc6f64801f7d40394d6039b77912323370f4a2bcf3cbea2e684a643553ec2c8d60f0d0fbb24b7db7a +EBUILD rust-bin-1.81.0-r101.ebuild 7796 BLAKE2B d4fa84b38416621e531c0fa8721d7d4c351da246324a691cceaebcc8379c5c9003dc5a0c95353b94ab8b1ab1905fb9578d3d951d1c8a986dd720d2282ac76b12 SHA512 4972eef30629e93301d931f56354008a1184acf209740d1cfde93440023e9ca0c8ffb4d7c218ab6930724b827a796f102d56eef73feb378f3be5a7eafe55cf35 EBUILD rust-bin-1.82.0-r100.ebuild 7824 BLAKE2B c62734b23b47f074ec71ef4c9ef362551a94a0d8e2949573433a34809647d93e86ff7afca3d017dab587f5789a36789fb955776641d96c32acfb58fc4845a526 SHA512 af1536ddff50283b2712f8d383daedf3397705a26a9b8d8f1ce802cb5e5c2e04fdd23fa1ff87dc4ef9a9be597504bf828fed578c22d87bd57f93055177656c19 -EBUILD rust-bin-1.82.0-r101.ebuild 8269 BLAKE2B 80ba0018f93242277118f4063a95179bd852ff9510050a636f00867634c61f6ca072ef9926afe91ef22580c8fc34fea6fe54147675aa3ca87f48835e16182d45 SHA512 606bb8ceea0a54412cec2dcd135200add98170885127140465b105ec4ecfa0a47d6bbccdd01609f318135b6d1e51118d776b1a709db73040f5e4e62b051c71e0 -EBUILD rust-bin-1.83.0.ebuild 7825 BLAKE2B b1d8198e30cf669a68c1b752581d51046711dedba3e578b4d48b8f845f5cf45c7675a750c585e9948a92c8fd90a63ca4cc071b37d4dd183bb5bff3b2da7a2d54 SHA512 15d468c4a06b2bc8867bac0368a2f26204650ae230cb6ee885125ce71a130e416b35e9071a9b7bad2a0a69b1059fa5d02f97778a2e5a497c954b405cf487ea0d +EBUILD rust-bin-1.82.0-r101.ebuild 7824 BLAKE2B c62734b23b47f074ec71ef4c9ef362551a94a0d8e2949573433a34809647d93e86ff7afca3d017dab587f5789a36789fb955776641d96c32acfb58fc4845a526 SHA512 af1536ddff50283b2712f8d383daedf3397705a26a9b8d8f1ce802cb5e5c2e04fdd23fa1ff87dc4ef9a9be597504bf828fed578c22d87bd57f93055177656c19 +EBUILD rust-bin-1.83.0.ebuild 7824 BLAKE2B 96443a317063b50025f352f4433c0d8b44f397b9b954500815cbbbfc9ed5416c58030133e32089408cbf0aebeb764fb5aae739b64f1edf924dd14f7b76a04ecf SHA512 c2b05d8161b268a0c440c510eebb045d4caf47fc298839deaaa9d05034c22fa81a7c646244f4f47f45f405f105fb4c5d5a36ea5959a12bb71f9669b12c424e46 MISC metadata.xml 1062 BLAKE2B de2d2adcb691a3e614457dd9a7f5d4a8eddffd548b2de8a229b6d397ae79f7e24484512a1fb2a85e02aa98c240ae73420dbe48e45790c0cd3f6381ef5a4ac24b SHA512 ee4d08b8eec8abd89e051ee5ec6cc928bfde7039b815d4539558d71d7c0576aea939b7781b4998d3fcf2c2e8752791d53c0ba6115df07fc2243c470b2a7467b9 diff --git a/dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild index 3a37b965eca8..9e716ace2e5b 100644 --- a/dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild @@ -24,19 +24,18 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -131,16 +130,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild index 27f76c86c891..23d2616783ae 100644 --- a/dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild @@ -34,19 +34,18 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -141,16 +140,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild index d8816da33893..9bb32c144c66 100644 --- a/dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild @@ -34,19 +34,18 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -141,16 +140,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild index 957aa1b35be3..5eb6567f5cdd 100644 --- a/dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild @@ -34,19 +34,18 @@ SRC_URI+=" mips? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -141,16 +140,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild index fbba0eaafe7c..55b9d0d15962 100644 --- a/dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild @@ -37,19 +37,18 @@ SRC_URI+=" riscv? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -144,16 +143,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild index cc54b88837b5..8b3aab679bda 100644 --- a/dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild @@ -41,19 +41,18 @@ SRC_URI+=" ppc64? ( elibc_musl? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -148,16 +147,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild index 92018fea9922..aabb1ed9c384 100644 --- a/dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild @@ -41,19 +41,18 @@ SRC_URI+=" ppc64? ( elibc_musl? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -148,16 +147,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild index a4cbf3b1c091..b1a1d5f9037b 100644 --- a/dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild @@ -41,19 +41,18 @@ SRC_URI+=" ppc64? ( elibc_musl? ( LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - !llvm-libunwind? ( sys-devel/gcc:* ) + sys-devel/gcc:* !dev-lang/rust:stable !dev-lang/rust-bin:stable " BDEPEND=" prefix? ( dev-util/patchelf ) - llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -150,16 +149,6 @@ multilib_src_install() { eend ${PIPESTATUS[0]} fi - if use llvm-libunwind; then - ebegin "Replacing libgcc_s with libunwind" - find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ - while IFS= read -r -d '' filename; do - # just ignore wrong filetype error, instead of checking redundantly - patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null - done - eend ${PIPESTATUS[0]} - fi - local symlinks=( cargo rustc diff --git a/dev-lang/rust-bin/rust-bin-1.83.0.ebuild b/dev-lang/rust-bin/rust-bin-1.83.0.ebuild index a703d3849cc7..3b04eb349c4b 100644 --- a/dev-lang/rust-bin/rust-bin-1.83.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.83.0.ebuild @@ -35,8 +35,8 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. #)" SRC_URI+=" ppc64? ( elibc_musl? ( big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64-unknown-linux-musl.tar.xz ) + !big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64le-unknown-linux-musl.tar.xz ) ) )" -# !big-endian? ( ${GENTOO_BIN_BASEURI}/${MY_P}-powerpc64le-unknown-linux-musl.tar.xz ) LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index 1bf9498ef41c..258015816825 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,8 +1,10 @@ +AUX zig-0.13.0-skip-test-stack_iterator.patch 1443 BLAKE2B 347a7a397c706105456ba83d9511633d3f1a75aa33a06dfccfde457c93af79149c4bb704e0e493a6b69a840784739c34b7a4f570608c368bb84673def0404857 SHA512 7b446efad0a95d3483a570552f3a1df2a535a757e16eb8484571ab1c9fd525b7b68b36ca84fb30bcce77709f9936e4c361ae04362456a60a9f59516824e3a254 AUX zig-0.13.0-test-fmt-no-doc.patch 653 BLAKE2B 92f28d86fde0ce3315b8e7b50dcdf03c1ef8a95964701d3c3c05dc8c16b08f9e327d190e9f9631c2a3a287b8b2945025abbf1b5c75d3bdb3adf719d1a6513703 SHA512 310d356f07505fa44e8425ec32f823eab5e20f9a0144c2e2ecff38e19ac1814d4320430373d4f2fa5ed9cf57000a126089c185fd6336daed8cc7dc0cffc0c023 AUX zig-0.13.0-test-std-kernel-version.patch 1304 BLAKE2B a266cc8d41df8eabc44cc381fe66e5b548d0e10eb0d0098350ddf596602204a77062b8e4632f58250a40781f7a1d5c7e9905c1387ecf7a0c505e330612944f38 SHA512 a62977e3ba675b60866d7cebdc5ff676825e77dac93029d32af403e567b5ae462d49355407f9dbd33843c8b8393d8f05a39de73a8818daf3424df083e0185da6 DIST zig-0.13.0-llvm-18.1.8-r6-fix.patch 45968 BLAKE2B a07c47b22b079d324b200fe84af5c89ffe51a1c81f50ca894a80f9f9db51a9d4119ae51c2e4e84a9b4f0111b2b809978b88adca42480ee800693afbd78f47387 SHA512 148b3f4807763dfb6a4d4e201890fa8204deaf73e620a8b592dfa03b997bc16ed01ea26e4d85f242473e91ccc45b1a06af22f786851f8e26cec1ac821b14efdc DIST zig-0.13.0.tar.xz 17220728 BLAKE2B f4bbacc2012950c556bebc28fc322fc6424bf20fe118e8362373336b6460e514028978584087f6e7f25ed8b8e6991610edce625676a1dd80c1975c5f9ef48775 SHA512 6f5f31f4ba71a11d8b16c7a5a613e124095e503fa6b02d2b77e5b177674c739287e81d98d96dc261fed24bc836caf196f71c3fcc7a6518387df86ba9e03df4dd DIST zig-0.13.0.tar.xz.minisig 312 BLAKE2B 2d061257c9c75f9c36b01cfb08dcd2040538a125b9ea2cae8617ae5496e685b165933ce8981494419522b7e19b51fc69a651ecaa4a8930753acf2e4ae3d6e00f SHA512 21c6139c06cba6c5e23a3305fed0c0f1b9b32d9140bd686c26365ce0279d5f53cd081894eaba29f0c1ed51b2e831edf7bd4ae6a7eaee5018a252e312e9b65507 EBUILD zig-0.13.0-r1.ebuild 6212 BLAKE2B dc9966d60858e0c8c9c4a062bc826b502ae56d9432cf447021759976dca3e03d1b8ed7632e210a3f21a5414041d1b490321db970dcffa9181857cc096080577b SHA512 53651f874ee9a26d1d4fd2c6ba5a3d722f1aa086c02d57fed7be6e8e56dcd5dd5746f35c7dfe116cfaf5a008e9033697c8e2fe808f6e4ffc9fb0da357d455b8c -EBUILD zig-9999.ebuild 6947 BLAKE2B 3e5dfa505821e423d4f2c5a3869d28f7086eee57f2f5f6714bb16c89135f8a0c93dd5a666509b93ce53c31095246b12a7c593711d30cd05babe4340c4ef79d18 SHA512 317c15d456a1a6d505dad24cf111d4228b16537904a52eb7c7a82df3f996f8aa64bd82fd82f5610d891ab10aabaffefe513d5eb527f4d96d5931d71da8288745 +EBUILD zig-0.13.0-r2.ebuild 7263 BLAKE2B e62e6b54292e65fb008e7b005fd87ac1b7dc0caeca7a81c61f45bc3ee03dc18437caef7b320ee2ebf5daefe78799d7a6cde352fe61f4b3397eeee6aef6a9ec0c SHA512 4c535c7407af0bf2f907949e7ae139c06bc864e321829af59a213cc372796f843ebee2b6e449c2eed0b565e3b801521bfc1071487a73d07e5372c4344c16b476 +EBUILD zig-9999.ebuild 6977 BLAKE2B b4c58c01278d130eb0d7bff7bd91c576dda5de97f426ceb55139b0e298836f915f9cb53a39fee3d01de57e2b310d3e2f32d4a16fcf44f22b75a89efdf057f10a SHA512 d998a5b2bee29dd1bf4328858187bd65ac494df53d1e612b61bdaac54c1eba25270a6458c4978e96253ddaa9b23567530b6cec09779f27f56193139f7d51a0e0 MISC metadata.xml 633 BLAKE2B 46cca8909b0b7d65213dee9c7aa7a2c4b5b529734e3bde4f65320074bc38d68420dfaa28041873c7c2c0f1127aca327e32c103c06ab1b5d5ee0e485cb33bb133 SHA512 1d030ca79a3d49b6f573e7995e6f6ef50a6e33ea7e2755a678625645d5b0587f7877a357ea71905034b7029c8c6315b89ebdb5313102b6638b16c467e2ba1864 diff --git a/dev-lang/zig/files/zig-0.13.0-skip-test-stack_iterator.patch b/dev-lang/zig/files/zig-0.13.0-skip-test-stack_iterator.patch new file mode 100644 index 000000000000..e088af2102ed --- /dev/null +++ b/dev-lang/zig/files/zig-0.13.0-skip-test-stack_iterator.patch @@ -0,0 +1,32 @@ +From: Eric Joldasov <bratishkaerik@landless-city.net> + +Skip standalone test "stack_iterator" that fail on Gentoo Linux x86_64. +Fails in ReleaseSafe, ReleaseFast and ReleaseSmall, but not in Debug. +Reported to upstream here https://github.com/ziglang/zig/issues/19944 . + +Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net> + +diff --git a/test/standalone/stack_iterator/shared_lib_unwind.zig b/test/standalone/stack_iterator/shared_lib_unwind.zig +index 57513a49c6..75fddb04c9 100644 +--- a/test/standalone/stack_iterator/shared_lib_unwind.zig ++++ b/test/standalone/stack_iterator/shared_lib_unwind.zig +@@ -35,6 +35,7 @@ extern fn frame0( + ) void; + + pub fn main() !void { ++ if (true) return; + // Disabled until the DWARF unwinder bugs on .aarch64 are solved + if (builtin.omit_frame_pointer and comptime builtin.target.isDarwin() and builtin.cpu.arch == .aarch64) return; + +diff --git a/test/standalone/stack_iterator/unwind.zig b/test/standalone/stack_iterator/unwind.zig +index 69c463a0c1..40963af63d 100644 +--- a/test/standalone/stack_iterator/unwind.zig ++++ b/test/standalone/stack_iterator/unwind.zig +@@ -87,6 +87,7 @@ noinline fn frame0(expected: *[4]usize, unwound: *[4]usize) void { + } + + pub fn main() !void { ++ if (true) return; + // Disabled until the DWARF unwinder bugs on .aarch64 are solved + if (builtin.omit_frame_pointer and comptime builtin.target.isDarwin() and builtin.cpu.arch == .aarch64) return; + diff --git a/dev-lang/zig/zig-0.13.0-r2.ebuild b/dev-lang/zig/zig-0.13.0-r2.ebuild new file mode 100644 index 000000000000..b970092ce4e4 --- /dev/null +++ b/dev-lang/zig/zig-0.13.0-r2.ebuild @@ -0,0 +1,248 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( 18 ) +LLVM_OPTIONAL=1 + +ZIG_SLOT="$(ver_cut 1-2)" +ZIG_OPTIONAL=1 + +inherit check-reqs cmake flag-o-matic edo llvm-r1 toolchain-funcs zig + +DESCRIPTION="A robust, optimal, and maintainable programming language" +HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/ziglang/zig.git" + inherit git-r3 +else + VERIFY_SIG_METHOD=minisig + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub + inherit verify-sig + + SRC_URI=" + https://ziglang.org/download/${PV}/${P}.tar.xz + verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig ) + https://codeberg.org/BratishkaErik/distfiles/releases/download/dev-lang%2Fzig-${PV}/${P}-llvm-18.1.8-r6-fix.patch + " + KEYWORDS="~amd64 ~arm ~arm64" + + BDEPEND="verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )" +fi + +# project itself: MIT +# There are bunch of projects under "lib/" folder that are needed for cross-compilation. +# Files that are unnecessary for cross-compilation are removed by upstream +# and therefore their licenses (if any special) are not included. +# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) +# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) +# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) +# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain +# lib/libc/musl: MIT BSD-2 +# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND +# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+ +LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+" +SLOT="${ZIG_SLOT}" +IUSE="doc +llvm" +REQUIRED_USE=" + !llvm? ( !doc ) + llvm? ( ${LLVM_REQUIRED_USE} ) +" + +# Used by both "cmake" and "zig" eclasses. +BUILD_DIR="${WORKDIR}/${P}_build" + +# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend. +# (non-LLVM backends don't require these) +# They are not required "on their own", so please don't add them here. +# You can check https://github.com/ziglang/zig-bootstrap in future, to see +# options that are passed to LLVM CMake building (excluding "static" ofc). +DEPEND=" + llvm? ( + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT} + llvm-core/lld:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT}[zstd] + ') + ) +" +BDEPEND+=" + ${DEPEND} +" +RDEPEND="${DEPEND}" +IDEPEND="app-eselect/eselect-zig" + +DOCS=( "README.md" "doc/build.zig.zon.md" ) + +PATCHES=( + "${FILESDIR}/zig-0.13.0-test-std-kernel-version.patch" + "${FILESDIR}/zig-0.13.0-skip-test-stack_iterator.patch" + "${DISTDIR}/${P}-llvm-18.1.8-r6-fix.patch" +) + +# zig.eclass does not set this for us since we use ZIG_OPTIONAL=1 +QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig" + +# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118 +# Zig uses self-hosted compiler only +CHECKREQS_MEMORY="4G" + +pkg_setup() { + # Skip detecting zig executable. + ZIG_EXE="not-applicable" ZIG_VER="${PV}" zig_pkg_setup + + export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" + + if use llvm; then + tc-is-cross-compiler && die "USE=llvm is not yet supported when cross-compiling" + llvm-r1_pkg_setup + fi + + check-reqs_pkg_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig} + fi + fi + zig_src_unpack +} + +src_prepare() { + if use llvm; then + cmake_src_prepare + else + # Sync with zig_src_prepare + default_src_prepare + mkdir -p "${BUILD_DIR}" || die + einfo "BUILD_DIR: \"${BUILD_DIR}\"" + # "--system" mode is not used during bootstrap. + fi + + # Remove "limit memory usage" flags, it's already verified by + # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them + # according to CI OOM failures, which are not applicable to normal Gentoo build. + sed -i -e '/\.max_rss = .*,/d' build.zig || die +} + +src_configure() { + # Has no effect on final binary and only causes failures during bootstrapping. + filter-lto + + # Used during bootstrapping. stage1/stage2 have limited functionality + # and can't resolve native target, so we pass target in exact form. + declare -r -g ZIG_HOST_AS_TARGET="$(zig-utils_c_env_to_zig_target "${CBUILD:-${CHOST}}" "${CFLAGS}"})" + + # Note that if we are building with CMake, "my_zbs_args" + # are used only after compiling zig2. + local my_zbs_args=( + --zig-lib-dir "${S}/lib/" + # Will be a subdir under ZIG_SYS_INSTALL_DEST. + --prefix-lib-dir lib/ + + # These are built separately + -Dno-langref + -Dstd-docs=false + + --release=fast + ) + if use llvm; then + my_zbs_args+=( + -Denable-llvm=true + -Dstatic-llvm=false + -Dconfig_h="${BUILD_DIR}/config.h" + ) + else + my_zbs_args+=( + -Denable-llvm=false + ) + fi + + zig_src_configure + + if use llvm; then + # Build for native only, it's for zig2 (build-time executable) + # LLVM from BDEPEND + local mycmakeargs=( + -DZIG_SHARED_LLVM=ON + -DZIG_USE_LLVM_CONFIG=ON + + -DZIG_TARGET_TRIPLE=native + -DZIG_TARGET_MCPU=native + -DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}" + + -DCMAKE_PREFIX_PATH="$(get_llvm_prefix -b)" + -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}" + ) + + cmake_src_configure + fi +} + +src_compile() { + if use llvm; then + cmake_build zig2 + else + cd "${BUILD_DIR}" || die + ln -s "${S}/stage1/" . || die + ln -s "${S}/src/" . || die + ln -s "${S}/lib/" . || die + + local native_cc="$(tc-getBUILD_CC)" + "${native_cc}" -o bootstrap "${S}/bootstrap.c" || die "Zig's bootstrap.c compilation failed" + ZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}" CC="${native_cc}" edo ./bootstrap + fi + + cd "${BUILD_DIR}" || die + ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/" + + ./stage3/bin/zig env || die "Zig compilation failed" + + if use doc; then + ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/" + fi +} + +src_test() { + cd "${BUILD_DIR}" || die + ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native +} + +src_install() { + use doc && local HTML_DOCS=( "docgen/doc/langref.html" ) + + ZIG_EXE="./zig2" zig_src_install --prefix "${ZIG_SYS_INSTALL_DEST}" + + cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die + mv lib/zig/ lib2/ || die + rm -rf lib/ || die + mv lib2/ lib/ || die + dosym -r "${ZIG_SYS_INSTALL_DEST}/bin/zig" /usr/bin/zig-${PV} +} + +pkg_postinst() { + eselect zig update ifunset || die + + elog "Starting from 0.12.0, Zig no longer installs" + elog "precompiled standard library documentation." + elog "Instead, you can call \`zig std\` to compile it on-the-fly." + elog "It reflects all edits in standard library automatically." + elog "See \`zig std --help\` for more information." + elog "More details here: https://ziglang.org/download/0.12.0/release-notes.html#Redesign-How-Autodoc-Works" + + if ! use llvm; then + elog "Currently, Zig built without LLVM support lacks some" + elog "important features such as most optimizations, @cImport, etc." + elog "They are listed under \"Building from Source without LLVM\"" + elog "section of the README file from \"/usr/share/doc/${PF}\" ." + fi +} + +pkg_postrm() { + eselect zig update ifunset || die +} diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index 858ec3be9405..4f0358a96629 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -6,10 +6,13 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL=1 -inherit check-reqs cmake edo llvm-r1 toolchain-funcs +ZIG_SLOT="$(ver_cut 1-2)" +ZIG_OPTIONAL=1 + +inherit check-reqs cmake flag-o-matic edo llvm-r1 toolchain-funcs zig DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/" +HOMEPAGE="https://ziglang.org/ https://github.com/ziglang/zig/" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ziglang/zig.git" inherit git-r3 @@ -39,14 +42,15 @@ fi # lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND # lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+ LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+" -SLOT="$(ver_cut 1-2)" +SLOT="${ZIG_SLOT}" IUSE="doc +llvm" REQUIRED_USE=" !llvm? ( !doc ) llvm? ( ${LLVM_REQUIRED_USE} ) " -BUILD_DIR="${S}/build" +# Used by both "cmake" and "zig" eclasses. +BUILD_DIR="${WORKDIR}/${P}_build" # Zig requires zstd and zlib compression support in LLVM, if using LLVM backend. # (non-LLVM backends don't require these) @@ -62,173 +66,176 @@ DEPEND=" ') ) " - -RDEPEND=" +BDEPEND+=" ${DEPEND} " - +RDEPEND="${DEPEND}" IDEPEND="app-eselect/eselect-zig" -# see https://github.com/ziglang/zig/issues/3382 -# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc. -QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig" +DOCS=( "README.md" "doc/build.zig.zon.md" ) -RESTRICT="!llvm? ( test )" +# zig.eclass does not set this for us since we use ZIG_OPTIONAL=1 +QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig" # Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118 # Zig uses self-hosted compiler only CHECKREQS_MEMORY="4G" -ctarget_to_zigtarget() { - # Zig's Target Format: arch-os-abi - local CTARGET="${CTARGET:-${CHOST}}" - - local ZIG_ARCH - case "${CTARGET%%-*}" in - i?86) ZIG_ARCH=x86;; - sparcv9) ZIG_ARCH=sparc64;; - *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST - esac - - local ZIG_OS - case "${CTARGET}" in - *linux*) ZIG_OS=linux;; - *apple*) ZIG_OS=macos;; - esac - - local ZIG_ABI - case "${CTARGET##*-}" in - gnu) ZIG_ABI=gnu;; - solaris*) ZIG_OS=solaris ZIG_ABI=none;; - darwin*) ZIG_ABI=none;; - *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST - esac - - echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}" -} +pkg_setup() { + # Skip detecting zig executable. + ZIG_EXE="not-applicable" ZIG_VER="${PV}" zig_pkg_setup -get_zig_mcpu() { - local ZIG_DEFAULT_MCPU=native - tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline - echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}" -} + export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" + + if use llvm; then + tc-is-cross-compiler && die "USE=llvm is not yet supported when cross-compiling" + llvm-r1_pkg_setup + fi -get_zig_target() { - local ZIG_DEFAULT_TARGET=native - tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)" - echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}" + check-reqs_pkg_setup } -pkg_setup() { - # Useful for debugging and a little bit more deterministic. - export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache" - export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache" +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig} + fi + fi + zig_src_unpack +} - export ZIG_SYS_INSTALL_DEST="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" +src_prepare() { + if use llvm; then + cmake_src_prepare + else + # Sync with zig_src_prepare + default_src_prepare + mkdir -p "${BUILD_DIR}" || die + einfo "BUILD_DIR: \"${BUILD_DIR}\"" + # "--system" mode is not used during bootstrap. + fi - use llvm && llvm-r1_pkg_setup - check-reqs_pkg_setup + # Remove "limit memory usage" flags, it's already verified by + # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them + # according to CI OOM failures, which are not applicable to normal Gentoo build. + sed -i -e '/\.max_rss = .*,/d' build.zig || die } src_configure() { - if ! use llvm; then - mkdir -p "${BUILD_DIR}/stage3" || die - # Currently, Zig without LLVM extensions lacks most optimizations. - export ZIG_BOOTSTRAP_STAGE3_FLAGS=( - -Dtarget="$(get_zig_target)" - -Dcpu="$(get_zig_mcpu)" - -Doptimize=Debug - -Dstd-docs=false - -Dno-langref + # Has no effect on final binary and only causes failures during bootstrapping. + filter-lto + + # Used during bootstrapping. stage1/stage2 have limited functionality + # and can't resolve native target, so we pass target in exact form. + declare -r -g ZIG_HOST_AS_TARGET="$(zig-utils_c_env_to_zig_target "${CBUILD:-${CHOST}}" "${CFLAGS}"})" + + # Note that if we are building with CMake, "my_zbs_args" + # are used only after compiling zig2. + local my_zbs_args=( + --zig-lib-dir "${S}/lib/" + # Will be a subdir under ZIG_SYS_INSTALL_DEST. + --prefix-lib-dir lib/ + + # These are built separately + -Dno-langref + -Dstd-docs=false + + --release=fast + ) + if use llvm; then + my_zbs_args+=( + -Denable-llvm=true + -Dstatic-llvm=false + -Dconfig_h="${BUILD_DIR}/config.h" + ) + else + my_zbs_args+=( -Denable-llvm=false - -Dforce-link-libc ) - return fi - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_SHARED_LLVM=ON - -DZIG_TARGET_TRIPLE="$(get_zig_target)" - -DZIG_TARGET_MCPU="$(get_zig_mcpu)" - -DZIG_USE_LLVM_CONFIG=ON - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix)" - -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}" - ) + zig_src_configure + + if use llvm; then + # Build for native only, it's for zig2 (build-time executable) + # LLVM from BDEPEND + local mycmakeargs=( + -DZIG_SHARED_LLVM=ON + -DZIG_USE_LLVM_CONFIG=ON - cmake_src_configure + -DZIG_TARGET_TRIPLE=native + -DZIG_TARGET_MCPU=native + -DZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}" + + -DCMAKE_PREFIX_PATH="$(get_llvm_prefix -b)" + -DCMAKE_INSTALL_PREFIX="${ZIG_SYS_INSTALL_DEST}" + ) + + cmake_src_configure + fi } src_compile() { - # Remove "limit memory usage" flags, it's already verified by - # CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them - # according to CI OOM failures, which are higher than during Gentoo build. - sed -i -e '/\.max_rss = .*,/d' build.zig || die + if use llvm; then + cmake_build zig2 + else + cd "${BUILD_DIR}" || die + ln -s "${S}/stage1/" . || die + ln -s "${S}/src/" . || die + ln -s "${S}/lib/" . || die - if ! use llvm; then - $(tc-getCC) -o bootstrap bootstrap.c || die "Zig's bootstrap.c compilation failed" - edob ./bootstrap - edo ./zig2 build install --prefix "${BUILD_DIR}/stage3/" "${ZIG_BOOTSTRAP_STAGE3_FLAGS[@]}" - return + local native_cc="$(tc-getBUILD_CC)" + "${native_cc}" -o bootstrap "${S}/bootstrap.c" || die "Zig's bootstrap.c compilation failed" + ZIG_HOST_TARGET_TRIPLE="${ZIG_HOST_AS_TARGET}" CC="${native_cc}" edo ./bootstrap fi - cmake_src_compile + cd "${BUILD_DIR}" || die + ZIG_EXE="./zig2" zig_src_compile --prefix "${BUILD_DIR}/stage3/" - "${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed" + ./stage3/bin/zig env || die "Zig compilation failed" if use doc; then - cd "${BUILD_DIR}" || die - edo ./stage3/bin/zig build std-docs --zig-lib-dir "${BUILD_DIR}/stage3/lib/zig/" --prefix "${S}/docgen/" - edo ./stage3/bin/zig build langref --zig-lib-dir "${BUILD_DIR}/stage3/lib/zig/" --prefix "${S}/docgen/" + ZIG_EXE="./stage3/bin/zig" zig_src_compile langref --prefix "${S}/docgen/" fi } src_test() { cd "${BUILD_DIR}" || die - local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \ - -Doptimize=ReleaseSafe -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)" - local ZIG_TEST_STEPS=( - test-fmt test-cases test-behavior test-c-import test-compiler-rt test-universal-libc test-compare-output - test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c - test-run-translated-c test-std - ) - - local step - for step in "${ZIG_TEST_STEPS[@]}" ; do - edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS} - done + ZIG_EXE="./stage3/bin/zig" zig_src_test -Dskip-non-native } src_install() { - local DOCS=( "README.md" "doc/build.zig.zon.md" ) - use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" ) + use doc && local HTML_DOCS=( "docgen/doc/langref.html" ) - if ! use llvm; then - DESTDIR="${D}" edo ./zig2 build install --prefix "${ZIG_SYS_INSTALL_DEST}" "${ZIG_BOOTSTRAP_STAGE3_FLAGS[@]}" - einstalldocs - else - cmake_src_install - fi + ZIG_EXE="./zig2" zig_src_install --prefix "${ZIG_SYS_INSTALL_DEST}" - cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die + cd "${D}/${ZIG_SYS_INSTALL_DEST}" || die mv lib/zig/ lib2/ || die rm -rf lib/ || die mv lib2/ lib/ || die - dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}" + dosym -r "${ZIG_SYS_INSTALL_DEST}/bin/zig" /usr/bin/zig-${PV} } pkg_postinst() { - eselect zig update ifunset + eselect zig update ifunset || die + + elog "Starting from 0.12.0, Zig no longer installs" + elog "precompiled standard library documentation." + elog "Instead, you can call \`zig std\` to compile it on-the-fly." + elog "It reflects all edits in standard library automatically." + elog "See \`zig std --help\` for more information." + elog "More details here: https://ziglang.org/download/0.12.0/release-notes.html#Redesign-How-Autodoc-Works" if ! use llvm; then elog "Currently, Zig built without LLVM support lacks some" elog "important features such as most optimizations, @cImport, etc." elog "They are listed under \"Building from Source without LLVM\"" elog "section of the README file from \"/usr/share/doc/${PF}\" ." - elog "It's recommended to use C backend directly with this stage2 build." fi } pkg_postrm() { - eselect zig update ifunset + eselect zig update ifunset || die } |