Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zsync: fix build #368971

Merged
merged 2 commits into from
Jan 2, 2025
Merged

zsync: fix build #368971

merged 2 commits into from
Jan 2, 2025

Conversation

ryand56
Copy link
Member

@ryand56 ryand56 commented Dec 29, 2024

Fixes build with GCC 14.
Closes #368680

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ryand56 ryand56 marked this pull request as ready for review December 29, 2024 01:20
@ofborg ofborg bot requested a review from viric December 29, 2024 06:13
@kuflierl
Copy link

I think it might make more sense to pull source from https://github.com/cph6/zsync (i think this is the official abandoned repo) instead of internet archive.

@ryand56
Copy link
Member Author

ryand56 commented Dec 30, 2024

I think it might make more sense to pull source from cph6/zsync (i think this is the official abandoned repo) instead of internet archive.

I've tried using the source mentioned, but could not get it to configure correctly.
After using autoreconfHook:

error: builder for '/nix/store/9lamrhyhxb5zzpdvvrahwrribl16sgj0-zsync-0.6.2-unstable-2017-04-25.drv' failed with exit code 2;
       last 25 log lines:
       > Making all in librcksum
       > make[2]: Entering directory '/build/source/c/librcksum'
       > gcc -DHAVE_CONFIG_H -I. -I..     -g -O2 -g -Wall -Wwrite-strings -Winline -Wextra -Winline -Wmissing-noreturn -Wredundant-decls -Wnested-externs -Wundef -Wbad-function-cast -Wcast-align -Wvolatile-register-var -ffast-math -c -o md4test.o md4test.c
       > In file included from /nix/store/kj8hbqx4ds9qm9mq7hyikxyfwwg13kzj-glibc-2.40-36-dev/include/bits/libc-header-start.h:33,
       >                  from /nix/store/kj8hbqx4ds9qm9mq7hyikxyfwwg13kzj-glibc-2.40-36-dev/include/string.h:26,
       >                  from md4test.c:18:
       > /nix/store/kj8hbqx4ds9qm9mq7hyikxyfwwg13kzj-glibc-2.40-36-dev/include/features.h:197:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
       >   197 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       >       |   ^~~~~~~
       > gcc -DHAVE_CONFIG_H -I. -I..     -g -O2 -g -Wall -Wwrite-strings -Winline -Wextra -Winline -Wmissing-noreturn -Wredundant-decls -Wnested-externs -Wundef -Wbad-function-cast -Wcast-align -Wvolatile-register-var -ffast-math -c -o md4.o md4.c
       > md4.c:36: warning: ignoring '#pragma clang diagnostic' [-Wunknown-pragmas]
       >    36 | #pragma clang diagnostic ignored "-Wconversion"
       > gcc  -g -O2 -g -Wall -Wwrite-strings -Winline -Wextra -Winline -Wmissing-noreturn -Wredundant-decls -Wnested-externs -Wundef -Wbad-function-cast -Wcast-align -Wvolatile-register-var -ffast-math   -o md4test md4test.o md4.o
       > gcc -DHAVE_CONFIG_H -I. -I..     -g -O2 -g -Wall -Wwrite-strings -Winline -Wextra -Winline -Wmissing-noreturn -Wredundant-decls -Wnested-externs -Wundef -Wbad-function-cast -Wcast-align -Wvolatile-register-var -ffast-math -c -o rsum.o rsum.c
       > In file included from /nix/store/kj8hbqx4ds9qm9mq7hyikxyfwwg13kzj-glibc-2.40-36-dev/include/bits/libc-header-start.h:33,
       >                  from /nix/store/kj8hbqx4ds9qm9mq7hyikxyfwwg13kzj-glibc-2.40-36-dev/include/stdio.h:28,
       >                  from rsum.c:23:
       > /nix/store/kj8hbqx4ds9qm9mq7hyikxyfwwg13kzj-glibc-2.40-36-dev/include/features.h:197:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
       >   197 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
       >       |   ^~~~~~~
       > make[2]: *** No rule to make target 'rsumtest.c', needed by 'rsumtest.o'.  Stop.
       > make[2]: Leaving directory '/build/source/c/librcksum'
       > make[1]: *** [Makefile:751: all-recursive] Error 1
       > make[1]: Leaving directory '/build/source/c'
       > make: *** [Makefile:585: all] Error 2
       For full logs, run 'nix log /nix/store/9lamrhyhxb5zzpdvvrahwrribl16sgj0-zsync-0.6.2-unstable-2017-04-25.drv'.

@linsui
Copy link
Contributor

linsui commented Dec 30, 2024

Maybe you can apply this patch? cph6/zsync#8

@ryand56 ryand56 marked this pull request as draft December 30, 2024 21:36
@ryand56 ryand56 marked this pull request as ready for review December 30, 2024 22:05
@ofborg ofborg bot added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label Dec 31, 2024
@ryand56 ryand56 marked this pull request as draft December 31, 2024 08:39
@ryand56 ryand56 marked this pull request as ready for review December 31, 2024 08:44
@ryand56
Copy link
Member Author

ryand56 commented Jan 1, 2025

@ofborg eval

Copy link

@kuflierl kuflierl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 1, 2025
@emilazy emilazy merged commit 26409e4 into NixOS:master Jan 2, 2025
24 of 25 checks passed
@ryand56 ryand56 deleted the zsync/fix-build branch January 3, 2025 03:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: zsync
5 participants