Skip to content

Commit

Permalink
Switch onig and onig_sys dependencies to greymd fork for musl compile…
Browse files Browse the repository at this point in the history
… fix

This commit updates the Cargo.toml and Cargo.lock to point to the greymd fork of the rust-onig repository. The change incorporates a critical fix for compiling onig_sys with musl libc, addressing an issue with _FORTIFY_SOURCE redefinitions and ensuring compatibility with musl targets. This update is necessary to utilize the modifications made in the fork, which disable automatic _FORTIFY_SOURCE insertions when building for musl environments, eliminating related compile-time warnings and errors.

The specific revisions updated in Cargo.toml and Cargo.lock reflect the commit in the fork that implements these adjustments. This transition to the forked repository will remain in place until the upstream rust-onig repository merges the relevant changes or another solution is implemented.
  • Loading branch information
greymd committed Feb 12, 2024
1 parent 8797483 commit f244b15
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ structopt = "0.3.26"
cfg-if = "0.1"

# Workaround of build failure https://github.com/rust-onig/rust-onig/pull/174#issuecomment-1730863567 Keep them until new onig crate' is released
onig = { git = "https://github.com/rust-onig/rust-onig", revision = "fa90c0e97e90a056af89f183b23cd417b59ee6a2" , optional = true}
onig = { git = "https://github.com/greymd/rust-onig", revision = "85989776a46c96347c6586ca4ab3ba62cce27332" , optional = true}

[patch.crates-io]
onig_sys = { git = "https://github.com/rust-onig/rust-onig", revision = "fa90c0e97e90a056af89f183b23cd417b59ee6a2", optional = true }
onig_sys = { git = "https://github.com/greymd/rust-onig", revision = "85989776a46c96347c6586ca4ab3ba62cce27332", optional = true }

[dev-dependencies]
assert_cmd = "1.0.1"
Expand Down

0 comments on commit f244b15

Please sign in to comment.