build: remove configure check for cargo vendor

cargo vendor has been part of the core cargo command since Rust 1.37,
and are minimum Rust version is not 1.41, so remove the check. Its
always available now.
pull/6996/head
Jason Ish 4 years ago committed by Victor Julien
parent 62cc813f88
commit 2ebb525f7e

@ -2305,21 +2305,6 @@ fi
AC_SUBST(rust_vendor_comment) AC_SUBST(rust_vendor_comment)
AM_CONDITIONAL([HAVE_RUST_VENDOR], [test "x$have_rust_vendor" = "xyes"]) AM_CONDITIONAL([HAVE_RUST_VENDOR], [test "x$have_rust_vendor" = "xyes"])
# With Rust/Cargo 1.37 and greater, cargo-vendor is built-in.
AC_MSG_CHECKING(for cargo vendor support)
AS_VERSION_COMPARE([$cargo_version], [1.37.0],
[have_cargo_vendor="no"],
[have_cargo_vendor="yes"],
[have_cargo_vendor="yes"])
AC_MSG_RESULT($have_cargo_vendor)
# If Rust is older than 1.37, check for cargo-vendor as an
# external sub-command.
if test "x$have_cargo_vendor" != "xyes"; then
AC_CHECK_PROG(have_cargo_vendor_bin, cargo-vendor, yes, no)
have_cargo_vendor=$have_cargo_vendor_bin
fi
have_rust_headers="no" have_rust_headers="no"
AC_MSG_CHECKING(for $srcdir/rust/dist/rust-bindings.h) AC_MSG_CHECKING(for $srcdir/rust/dist/rust-bindings.h)
if test -f "$srcdir/rust/dist/rust-bindings.h"; then if test -f "$srcdir/rust/dist/rust-bindings.h"; then
@ -2368,7 +2353,6 @@ fi
AM_CONDITIONAL([HAVE_RUST_HEADERS], [test "x$have_rust_headers" = "xyes"]) AM_CONDITIONAL([HAVE_RUST_HEADERS], [test "x$have_rust_headers" = "xyes"])
AM_CONDITIONAL([HAVE_CBINDGEN], [test "x$CBINDGEN" != "xno"]) AM_CONDITIONAL([HAVE_CBINDGEN], [test "x$CBINDGEN" != "xno"])
AM_CONDITIONAL([HAVE_CARGO_VENDOR], [test "x$have_cargo_vendor" != "xno"])
AC_ARG_ENABLE(rust_strict, AC_ARG_ENABLE(rust_strict,
AS_HELP_STRING([--enable-rust-strict], [Rust warnings as errors]),[enable_rust_strict=$enableval],[enable_rust_strict=no]) AS_HELP_STRING([--enable-rust-strict], [Rust warnings as errors]),[enable_rust_strict=$enableval],[enable_rust_strict=no])
@ -2589,7 +2573,6 @@ SURICATA_BUILD_CONF="Suricata Configuration:
Rust compiler version: ${rust_compiler_version} Rust compiler version: ${rust_compiler_version}
Cargo path: ${CARGO} Cargo path: ${CARGO}
Cargo version: ${cargo_version_output} Cargo version: ${cargo_version_output}
Cargo vendor: ${have_cargo_vendor}
Python support: ${enable_python} Python support: ${enable_python}
Python path: ${python_path} Python path: ${python_path}

@ -1,11 +1,8 @@
EXTRA_DIST = src derive \ EXTRA_DIST = src derive \
.cargo/config.in \ .cargo/config.in \
cbindgen.toml \ cbindgen.toml \
dist/rust-bindings.h dist/rust-bindings.h \
vendor
if HAVE_CARGO_VENDOR
EXTRA_DIST += vendor
endif
if !DEBUG if !DEBUG
RELEASE = --release RELEASE = --release
@ -79,12 +76,8 @@ check:
CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \ CARGO_TARGET_DIR="$(abs_top_builddir)/rust/target" \
$(CARGO) test --all $(RELEASE) --features "$(RUST_FEATURES)" $(CARGO) test --all $(RELEASE) --features "$(RUST_FEATURES)"
if HAVE_CARGO_VENDOR
vendor: vendor:
CARGO_HOME="$(CARGO_HOME)" @rustup_home@ $(CARGO) vendor > /dev/null CARGO_HOME="$(CARGO_HOME)" @rustup_home@ $(CARGO) vendor > /dev/null
else
vendor:
endif
if HAVE_CBINDGEN if HAVE_CBINDGEN
gen/rust-bindings.h: $(RUST_SURICATA_LIB) gen/rust-bindings.h: $(RUST_SURICATA_LIB)

Loading…
Cancel
Save