Skip to content

Commit 77479e1

Browse files
committed
refactor: rename classes to unique names
1 parent 829ea2d commit 77479e1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

classes/cargo.bbclass renamed to classes/cargo_bin.bbclass

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
inherit rust-common
1+
inherit rust_bin-common
22

33
# Many crates rely on pkg-config to find native versions of their libraries for
44
# linking - do the simple thing and make it generally available.
@@ -75,7 +75,7 @@ create_cargo_config() {
7575
echo "debug = true" >> ${CARGO_HOME}/config
7676
}
7777

78-
cargo_do_configure() {
78+
cargo_bin_do_configure() {
7979
mkdir -p "${B}"
8080
mkdir -p "${CARGO_HOME}"
8181
mkdir -p "${WRAPPER_DIR}"
@@ -111,7 +111,7 @@ cargo_do_configure() {
111111
create_cargo_config
112112
}
113113

114-
cargo_do_compile() {
114+
cargo_bin_do_compile() {
115115
export TARGET_CC="${WRAPPER_DIR}/cc-wrapper.sh"
116116
export TARGET_CXX="${WRAPPER_DIR}/cxx-wrapper.sh"
117117
export CC="${WRAPPER_DIR}/cc-native-wrapper.sh"
@@ -130,7 +130,7 @@ cargo_do_compile() {
130130
cargo build ${CARGO_BUILD_FLAGS}
131131
}
132132

133-
cargo_do_install() {
133+
cargo_bin_do_install() {
134134
if [ "${CARGO_BUILD_TYPE}" = "--release" ]; then
135135
local cargo_bindir="${CARGO_RELEASE_DIR}"
136136
else
File renamed without changes.

recipes-devtools/rust/cargo-bin-cross.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0 | MIT"
44
SECTION = "devel"
55

66
inherit cross
7-
inherit rust-common
7+
inherit rust_bin-common
88

99
PN = "cargo-bin-cross-${TARGET_ARCH}"
1010

recipes-devtools/rust/rust-bin-cross.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LICENSE = "Apache-2.0 | MIT"
44
SECTION = "devel"
55

66
inherit cross
7-
inherit rust-common
7+
inherit rust_bin-common
88

99
# Required to link binaries
1010
DEPENDS += "gcc-cross-${TARGET_ARCH}"

0 commit comments

Comments
 (0)