From 92e79fc2d3c7ecf66a08bf0593c018455bdb7e4d Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 29 Dec 2014 11:04:05 -0500 Subject: [PATCH] cargo: rust-snapshot (via .travis.install.deps.sh) support --- recipes/cargo/cargo.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipes/cargo/cargo.inc b/recipes/cargo/cargo.inc index 34320a0..c0f10c4 100644 --- a/recipes/cargo/cargo.inc +++ b/recipes/cargo/cargo.inc @@ -23,7 +23,12 @@ PV .= "+git${SRCPV}" S = "${WORKDIR}/git" B = "${S}" +PACKAGECONFIG ??= "" +PACKAGECONFIG[rust-snapshot] = "--local-rust-root=${B}/rustc" + do_configure () { + ${@bb.utils.contains('PACKAGECONFIG', 'rust-snapshot', '${S}/.travis.install.deps.sh', ':', d)} + "${S}/configure" \ "--prefix=${prefix}" \ "--build=${BUILD_SYS}" \ @@ -35,6 +40,8 @@ do_configure () { "--infodir=${infodir}" \ "--mandir=${mandir}" \ "--libdir=${libdir}" \ + "--disable-verify-install" \ + ${EXTRA_OECONF} \ || die "Could not configure cargo" # cargo downloads a cargo snapshot to build itself using cargo, we need