jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-style cargo: move cargo config from wrksrc to home

Browse source 
since cargo 0.31.0 ${wrksrc}/.cargo/config is ignored for cargo install
fixes: https://github.com/void-linux/void-packages/issues/4328
This commit is contained in:
Johannes 2018-11-02 10:20:12 +01:00 committed by Enno Boland
parent a8f008f21c
commit 3aa797cb3a
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/build-style/cargo.sh
View file

@ -3,12 +3,11 @@
# #
do_configure() { do_configure() {
mkdir -p .cargo mkdir -p ${HOME}/.cargo
# respect makejobs, do cross stuff # respect makejobs, do cross stuff
cat > .cargo/config <<EOF cat > ${HOME}/.cargo/config <<EOF
[build] [build]
jobs = ${makejobs#*j} jobs = ${makejobs#*j}
target = "${RUST_TARGET}"
[target.${RUST_TARGET}] [target.${RUST_TARGET}]
linker = "${CC}" linker = "${CC}"
@ -18,7 +17,7 @@ EOF
do_build() { do_build() {
: ${make_cmd:=cargo} : ${make_cmd:=cargo}
${make_cmd} build --release ${configure_args} ${make_cmd} build --release --target ${RUST_TARGET} ${configure_args}
} }
do_check() { do_check() {
@ -30,6 +29,7 @@ do_check() {
do_install() { do_install() {
: ${make_cmd:=cargo} : ${make_cmd:=cargo}
${make_cmd} install --root="${DESTDIR}/usr" ${make_install_args} ${make_cmd} install --path . --target ${RUST_TARGET} --root="${DESTDIR}/usr" \
${make_install_args}
rm "${DESTDIR}"/usr/.crates.toml rm "${DESTDIR}"/usr/.crates.toml
} }

3
common/environment/build-style/cargo.sh
View file

@ -4,7 +4,4 @@ if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std" makedepends+=" rust-std"
fi fi
# Use the config we set in do_configure
export CARGO_HOME="$wrksrc/.cargo"
export PKG_CONFIG_ALLOW_CROSS=1 export PKG_CONFIG_ALLOW_CROSS=1