rsync: Fix enable* options breaking build if disabled
#152354
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rsync's configure script now complains if these on-by-default dependencies
cannot be found; example:
Configure found the following issues:
- Failed to find openssl/md4.h and openssl/md5.h for openssl crypto lib support.
- Failed to find xxhash.h for xxhash checksum support.
See the INSTALL file for hints on how to install the missing libraries and/or
how to generate (or fetch) man pages:
https://github.com/WayneD/rsync/blob/master/INSTALL.md
To disable one or more features, the relevant configure options are:
--disable-openssl
--disable-xxhash
This commit passes the flags as required.
Example to test (with `pkgsStatic`):
NIX_PATH=nixpkgs=. nix-build --no-out-link --expr 'with import <nixpkgs> {}; pkgsStatic.rsync.override (old: { enableOpenSSL = false; enableXXHash = false; })'
|
this looks fine, not sure if we should point this to staging since it seems to rebuild all of darwin? |
|
Result of 478 packages marked as broken and skipped:
1723 packages failed to build:
22 packages built:
|
|
Please rebase |
This was referenced Dec 9, 2022
This comment was marked as off-topic.
This comment was marked as off-topic.
|
@nh2 I merged to fix the conflict, but could you instead rebase? |
wmertens
requested review from
FRidh,
jonringer,
Ericson2314 and
matthewbauer
as code owners
ofborg
bot
added
10.rebuild-darwin: 501-1000
8.has: package (new)
10.rebuild-linux: 11-100
and removed
10.rebuild-darwin: 1001-2500
10.rebuild-linux: 0
labels
Comment on lines
+47
to
+51
| ++ lib.optional (!enableACLs) "--disable-acl-support" | ||
| ++ lib.optional (!enableOpenSSL) "--disable-openssl" | ||
| ++ lib.optional (!enableXXHash) "--disable-xxhash" | ||
| ++ lib.optional (!enableZstd) "--disable-zstd" | ||
| ++ lib.optional (!enableLZ4) "--disable-lz4" |
There was a problem hiding this comment.
We should use lib.enableFeature here
| # The following PR should fix the cross-compilation issue. | ||
| # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. | ||
| # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 | ||
| ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" |
There was a problem hiding this comment.
Sounds like we want to use canExecute here
|
|
||
| # Work around issue with cross-compilation: | ||
| # configure.sh: error: cannot run test program while cross compiling | ||
| # Remove once 3.2.4 or more recent is released. |
There was a problem hiding this comment.
We are using 3.2.7 already
SuperSandro2000
requested changes
Feb 14, 2023
wegank
added
the
2.status: stale
|
Closing as stale |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rsync's configure script now complains if these on-by-default dependencies
cannot be found; example:
This commit passes the flags as required.
Example to test (with
pkgsStatic):Motivation for this change
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes