diff options
| author | Canop <cano.petrole@gmail.com> | 2024-05-08 13:58:01 +0200 |
|---|---|---|
| committer | Canop <cano.petrole@gmail.com> | 2024-05-08 13:58:01 +0200 |
| commit | 8f50c72f58fbfd48d686aeb6ed1b1e79b5069204 (patch) | |
| tree | 182c659f5f735515e6c1ebf63740f9207f9b54c5 | |
| parent | f1b0dabdcdd9311ecba28555d0674e7dcb25fd3a (diff) | |
update changelog
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rwxr-xr-x | compile-all-targets.sh | 18 | ||||
| -rw-r--r-- | src/file_sum/sum_computation.rs | 1 |
3 files changed, 13 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 58005db..c5e4204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### next +- fix build on Android - thanks @dead10ck + ### v1.38.0 - 2024-05-04 <a name="v1.38.0"></a> - `-{flags}` verb lets you change the state the same way you do it at start, eg `:-sd` to show sizes and dates diff --git a/compile-all-targets.sh b/compile-all-targets.sh index eb509c9..7ed4a4c 100755 --- a/compile-all-targets.sh +++ b/compile-all-targets.sh @@ -43,15 +43,15 @@ cross_build() { echo " Done" } -cross_build "x86-64 GLIBC" "x86_64-unknown-linux-gnu" "" -cross_build "NetBSD/amd64" "x86_64-unknown-netbsd" "" -cross_build "MUSL" "x86_64-unknown-linux-musl" "" -cross_build "ARM 32" "armv7-unknown-linux-gnueabihf" "" -cross_build "ARM 32 MUSL" "armv7-unknown-linux-musleabi" "" -cross_build "ARM 64" "aarch64-unknown-linux-gnu" "" -cross_build "ARM 64 MUSL" "aarch64-unknown-linux-musl" "" +cross_build "x86-64 GLIBC" "x86_64-unknown-linux-gnu" "trash" +cross_build "NetBSD/amd64" "x86_64-unknown-netbsd" "trash" +cross_build "MUSL" "x86_64-unknown-linux-musl" "trash" +cross_build "ARM 32" "armv7-unknown-linux-gnueabihf" "trash" +cross_build "ARM 32 MUSL" "armv7-unknown-linux-musleabi" "trash" +cross_build "ARM 64" "aarch64-unknown-linux-gnu" "trash" +cross_build "ARM 64 MUSL" "aarch64-unknown-linux-musl" "trash" cross_build "Windows" "x86_64-pc-windows-gnu" "clipboard,trash" -# cross_build "Android" "aarch64-linux-android" "clipboard" Doesn't work anymore - See https://github.com/Canop/broot/issues/565 +# cross_build "Android" "aarch64-linux-android" "clipboard" Does not work anymore - See https://github.com/Canop/broot/issues/565 # Build the default linux version (with clipboard support, needing a recent GLIBC) @@ -63,7 +63,7 @@ mkdir build/x86_64-linux/ cp "target/release/$NAME" build/x86_64-linux/ # Find, and copy the completion scripts -# (they're built as part of the normal compilation by build.rs) +# (they are re built as part of the normal compilation by build.rs) echo -e "${H2}Copying completion scripts${EH}" mkdir build/completion cp "$(broot -c 'rp/release\/build\/broot-[^\/]+\/out\/broot.bash;:parent;:pp' target)/"* build/completion diff --git a/src/file_sum/sum_computation.rs b/src/file_sum/sum_computation.rs index a67ffb4..4146574 100644 --- a/src/file_sum/sum_computation.rs +++ b/src/file_sum/sum_computation.rs @@ -35,6 +35,7 @@ struct DirSummer { /// a node id, taking the device into account to be sure to discriminate /// nodes with the same inode but on different devices +#[cfg(unix)] #[derive(Debug, Clone, Copy, PartialEq, Hash, Eq)] struct NodeId { /// inode number |