Skip to content

Commit

Permalink
build: fix the cross build issues with openssl-sys
Browse files Browse the repository at this point in the history
  • Loading branch information
ctron committed Jul 12, 2024
1 parent cf8372a commit 995e050
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
16 changes: 15 additions & 1 deletion Cargo.lock

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

9 changes: 7 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ osv = { version = "0.2.0", default-features = false }
packageurl = "0.3.0"
parking_lot = "0.12"
pem = "3"
postgresql_archive = "0.14.0"
postgresql_embedded = "0.14.0"
prometheus = "0.13.3"
rand = "0.8.5" # for testing
regex = "1.10.3"
Expand Down Expand Up @@ -136,6 +134,13 @@ trustify-module-storage = { path = "modules/storage" }
trustify-module-graphql = { path = "modules/graphql" }
trustify-test-context = { path = "test-context" }

# These dependencies are active during both the build time and the run time. So they are normal dependencies
# as well as build-dependencies. However, we can't control feature flags for build dependencies the way we do
# it for normal dependencies. So enabling the vendor feature for openssl-sys doesn't work for the build-dependencies.
# This will fail the build on targets where we need vendoring for openssl. Using rustls instead works around this issue.
postgresql_archive = { version = "0.14.0", default-features = false, features = ["theseus", "rustls-tls"] }
postgresql_embedded = { version = "0.14.0", default-features = false, features = ["theseus", "rustls-tls"] }

[patch.crates-io]
#csaf-walker = { git = "https://github.com/ctron/csaf-walker", rev = "7b6e64dd56e4be79e184b053ef754a42e1496fe0" }
#sbom-walker = { git = "https://github.com/ctron/csaf-walker", rev = "7b6e64dd56e4be79e184b053ef754a42e1496fe0" }
Expand Down

0 comments on commit 995e050

Please sign in to comment.