Skip to content

Commit

Permalink
bad defaulting
Browse files Browse the repository at this point in the history
  • Loading branch information
sfoster1 committed Dec 16, 2024
1 parent b479033 commit 47a1d2e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion layers/meta-opentrons/classes/cargo_common.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export PKG_CONFIG_ALLOW_CROSS = "1"
# Don't instruct cargo to use crates downloaded by bitbake. Some rust packages,
# for example the rust compiler itself, come with their own vendored sources.
# Specifying two [source.crates-io] will not work.
CARGO_DISABLE_BITBAKE_VENDORING ??= "1"
CARGO_DISABLE_BITBAKE_VENDORING ??= "0"

# Used by libstd-rs to point to the vendor dir included in rustc src
CARGO_VENDORING_DIRECTORY ??= "${CARGO_HOME}/bitbake"
Expand Down
2 changes: 2 additions & 0 deletions layers/meta-opentrons/classes/pipenv_app_bundle.bbclass
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# pipenv_app_bundle.bbclass: Install python applications described by
# pipenv projects as directories in /opt (or anywhere, really)

CARGO_DISABLE_BITBAKE_VENDORING := "1"

inherit setuptools3-base cargo python_pyo3

DEPENDS += "python3 python3-native python3-pip-native python3-micropipenv-native python3-maturin-native "
Expand Down

0 comments on commit 47a1d2e

Please sign in to comment.