diff options
| author |   Daniel Müller <deso@posteo.net> | 2024-01-19 07:21:22 -0800 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2024-01-20 15:20:09 +0200 |
| commit | 8e9efa2ffcb018b6ca676404e5d1aeaf17e99bc1 (patch) | |
| tree | 2b33092fadba41d58b76e66069d2e51ad6710f36 /app-crypt | |
| parent | app-crypt/nitrocli: Drop 0.3.4, 0.3.5, 0.4.0 (diff) | |
| download | gentoo-8e9efa2ffcb018b6ca676404e5d1aeaf17e99bc1.tar.gz gentoo-8e9efa2ffcb018b6ca676404e5d1aeaf17e99bc1.tar.bz2 gentoo-8e9efa2ffcb018b6ca676404e5d1aeaf17e99bc1.zip | |
app-crypt/nitrocli: Add patch fixing musl 1.2.4 build
On a system with sys-libs/musl 1.2.4, the crate fails to build with an
undefined reference to `open64'.
Fix the issue by adding a patch bumping the version of the libc crate.
Closes: https://bugs.gentoo.org/922317
Signed-off-by: Daniel Müller <deso@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34902
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/nitrocli/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch | 16 | ||||
| -rw-r--r-- | app-crypt/nitrocli/nitrocli-0.4.1.ebuild | 8 |
3 files changed, 23 insertions, 3 deletions
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest index 59fc2dabc1ae..894bcb824499 100644 --- a/app-crypt/nitrocli/Manifest +++ b/app-crypt/nitrocli/Manifest @@ -13,7 +13,7 @@ DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a2 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c +DIST libc-0.2.146.crate 684707 BLAKE2B 53091a46262389e327973185c26bf187beba392c45a92bfa424fc0976333d6c8afdac6527484032574086e32412a712bc2616468f7cb14e6bd0480ca2bef6da6 SHA512 4112c17cfda83041f33a7b616a365a0eb6603ba857fd7bedd64162021a6305c81da6ae8f37395732d7eea40d4fe648bae435ee0bf0b1a1a48400e6546d4d50b6 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb DIST merge-0.1.0.crate 16946 BLAKE2B 1389893fdb788371e8f2526ef9fcc9e1b7a61a6f55fd092cc595339b9df9bc550546056191c1479ecaa13b88633e12656d2a8e217927495e0096ee5ca5641e47 SHA512 2adfef5cf142b06343e8f5816ffba7d031bc71b4a4e54170e36b88267d0c203ecc0cf084041cb25ae55df874fc80d55bd051c76f608ab85fd55f1b5512efe238 diff --git a/app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch b/app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch new file mode 100644 index 000000000000..4a5eed1b8951 --- /dev/null +++ b/app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index de9dee..5d7737 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -124,9 +124,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.94" ++version = "0.2.146" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" ++checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" + + [[package]] + name = "log" diff --git a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild index fcfc2efba490..f41366c4a624 100644 --- a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild +++ b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017-2023 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ getrandom-0.1.16 getrandom-0.2.2 heck-0.3.2 lazy_static-1.4.0 -libc-0.2.94 +libc-0.2.146 log-0.4.14 memchr-2.4.0 merge-0.1.0 @@ -93,6 +93,10 @@ RDEPEND=" RESTRICT="test" QA_FLAGS_IGNORED="usr/bin/nitrocli" +PATCHES=( + "${FILESDIR}"/${PN}-0.4.1-fix-musl-1.2.4-build.patch +) + src_compile() { cargo_src_compile --bin=nitrocli # Install shell-complete binary into source directory to be able to |