* [bug#57975] [PATCH] gnu: rust-libz-sys-1: Do not remove zlib-ng sources.
@ 2022-09-21 9:35 Ricardo Wurmus
2022-09-21 10:15 ` Maxime Devos
0 siblings, 1 reply; 4+ messages in thread
From: Ricardo Wurmus @ 2022-09-21 9:35 UTC (permalink / raw)
To: 57975; +Cc: Ricardo Wurmus
* gnu/packages/crates-io.scm (rust-libz-sys-1)[source]: Only delete bundled
zlib sources.
---
gnu/packages/crates-io.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 42a44a2930..f7703f9295 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -32568,9 +32568,9 @@ (define-public rust-libz-sys-1
"1q25cb8vs113si7q2p0innhi8jk0wpq37hqi2wcc219hcmw43cr3"))
(modules '((guix build utils)))
(snippet
- '(begin (delete-file-recursively "src/zlib")
- (delete-file-recursively "src/zlib-ng")
- #t))))
+ ;; Do not delete zlib-ng, because we have no native library
+ ;; for it.
+ '(delete-file-recursively "src/zlib"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
--
2.36.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#57975] [PATCH] gnu: rust-libz-sys-1: Do not remove zlib-ng sources.
2022-09-21 9:35 [bug#57975] [PATCH] gnu: rust-libz-sys-1: Do not remove zlib-ng sources Ricardo Wurmus
@ 2022-09-21 10:15 ` Maxime Devos
2022-09-21 10:27 ` Ricardo Wurmus
0 siblings, 1 reply; 4+ messages in thread
From: Maxime Devos @ 2022-09-21 10:15 UTC (permalink / raw)
To: Ricardo Wurmus, 57975
[-- Attachment #1.1.1: Type: text/plain, Size: 1499 bytes --]
On 21-09-2022 11:35, Ricardo Wurmus wrote:
> * gnu/packages/crates-io.scm (rust-libz-sys-1)[source]: Only delete bundled
> zlib sources.
> ---
> gnu/packages/crates-io.scm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index 42a44a2930..f7703f9295 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -32568,9 +32568,9 @@ (define-public rust-libz-sys-1
> "1q25cb8vs113si7q2p0innhi8jk0wpq37hqi2wcc219hcmw43cr3"))
> (modules '((guix build utils)))
> (snippet
> - '(begin (delete-file-recursively "src/zlib")
> - (delete-file-recursively "src/zlib-ng")
> - #t))))
> + ;; Do not delete zlib-ng, because we have no native library
> + ;; for it.
> + '(delete-file-recursively "src/zlib"))))
According to the README, zlib and zlib-ng are supposed to be compatible,
so zlib-ng should be removable (as long as dependents don't enable
zlib-ng, but that can be patched out).
Additionally, using zlib-ng can cause problems if the application also
links to the regular zlib:
README.md ‘and as long as you don't also dynamically pull in a copy of
stock zlib (which will produce conflicting symbols)’
Proposal: keep removing zlib-ng, and modify the enabled features in
whatever crate or Rust application asks for zlib-ng.
Greetings,
Maxime.
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#57975] [PATCH] gnu: rust-libz-sys-1: Do not remove zlib-ng sources.
2022-09-21 10:15 ` Maxime Devos
@ 2022-09-21 10:27 ` Ricardo Wurmus
2022-09-21 22:10 ` bug#57975: " Ricardo Wurmus
0 siblings, 1 reply; 4+ messages in thread
From: Ricardo Wurmus @ 2022-09-21 10:27 UTC (permalink / raw)
To: Maxime Devos; +Cc: 57975
Maxime Devos <maximedevos@telenet.be> writes:
> Proposal: keep removing zlib-ng, and modify the enabled features in
> whatever crate or Rust application asks for zlib-ng.
Thanks, I’ll give that a try by patching the target application.
--
Ricardo
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#57975: [PATCH] gnu: rust-libz-sys-1: Do not remove zlib-ng sources.
2022-09-21 10:27 ` Ricardo Wurmus
@ 2022-09-21 22:10 ` Ricardo Wurmus
0 siblings, 0 replies; 4+ messages in thread
From: Ricardo Wurmus @ 2022-09-21 22:10 UTC (permalink / raw)
To: Maxime Devos; +Cc: 57975-done
Ricardo Wurmus <rekado@elephly.net> writes:
> Maxime Devos <maximedevos@telenet.be> writes:
>
>> Proposal: keep removing zlib-ng, and modify the enabled features in
>> whatever crate or Rust application asks for zlib-ng.
>
> Thanks, I’ll give that a try by patching the target application.
Patching the package to not request the zlib-ng feature works, so I
retract this patch. Thanks again for the hint!
--
Ricardo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-21 22:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-21 9:35 [bug#57975] [PATCH] gnu: rust-libz-sys-1: Do not remove zlib-ng sources Ricardo Wurmus
2022-09-21 10:15 ` Maxime Devos
2022-09-21 10:27 ` Ricardo Wurmus
2022-09-21 22:10 ` bug#57975: " Ricardo Wurmus
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).