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

Unbreak build on DragonFly #89

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Unbreak build on DragonFly #89

merged 1 commit into from
Oct 18, 2023

Conversation

jbeich
Copy link
Contributor

@jbeich jbeich commented Oct 18, 2023

Found downstream via czkawka and nushell. This is a blind fix as I don't use DragonFly but one can set up CI via dragonflybsd-vm.

DragonFly forked from FreeBSD ~20 years ago, so getmntinfo(3) API is the same but the implementation lacks recent changes like freebsd/freebsd-src@5a28df2e1353 and freebsd/freebsd-src@34ed0c63c878. DragonFly unlike FreeBSD also has getmntvinfo(3) which uses statvfs similar to NetBSD getmntinfo(3) but NetBSD lacks getmntvinfo(3) (thus statvfs-only).

For simplicity let's use FreeBSD codepath.

DragonFly has `getmntinfo` for `statfs` and `getmntvinfo` for `statvfs`.
Use `statfs` variant for compatibility with FreeBSD and OpenBSD.

error[E0425]: cannot find function `get_mount_points` in this scope
  --> czkawka-6.0.0/cargo-crates/trash-3.0.2/src/freedesktop.rs:31:28
   |
31 |         let mount_points = get_mount_points()?;
   |                            ^^^^^^^^^^^^^^^^ not found in this scope

error[E0425]: cannot find function `get_mount_points` in this scope
  --> czkawka-6.0.0/cargo-crates/trash-3.0.2/src/freedesktop.rs:80:24
   |
80 |     let mount_points = get_mount_points()?;
   |                        ^^^^^^^^^^^^^^^^ not found in this scope
@Byron
Copy link
Owner

Byron commented Oct 18, 2023

Thanks a lot for your help!

@Byron Byron merged commit ad26100 into Byron:master Oct 18, 2023
3 checks passed
@Byron
Copy link
Owner

Byron commented Oct 18, 2023

A new release is available: https://github.com/Byron/trash-rs/releases/tag/v3.1.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants