From 4b987b3a0bbb1a704b2b5af434f8f773d05396d4 Mon Sep 17 00:00:00 2001 From: William Brown Date: Sep 26 2019 00:55:53 +0000 Subject: Ticket 50617 - disable cargo lock Bug Description: We need cargo lock for future offline builds, but the version of cargo in suse/rhel seems to old to support vendoring. Fix Description: For now, disable this, and rely on "online" builds (but we have no/few external deps anyway) https://pagure.io/389-ds-base/issue/50617 Author: William Brown Review by: mhonek, mreynolds (thanks!) --- diff --git a/Makefile.am b/Makefile.am index 6924d36..edfd30f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1205,14 +1205,14 @@ librsds_la_EXTRA = src/libsds/Cargo.lock @abs_top_builddir@/rs/@rust_target_dir@/librsds.a: $(librsds_la_SOURCES) CARGO_TARGET_DIR=$(abs_top_builddir)/rs RUSTC_BOOTSTRAP=1 \ - cargo rustc --manifest-path=$(srcdir)/src/libsds/Cargo.toml --locked \ + cargo rustc --manifest-path=$(srcdir)/src/libsds/Cargo.toml \ $(CARGO_FLAGS) --verbose -- $(RUSTC_FLAGS) EXTRA_DIST = $(librsds_la_SOURCES) $(librsds_la_EXTRA) check-local: CARGO_TARGET_DIR=$(abs_top_builddir)/rs RUSTC_BOOTSTRAP=1 \ - cargo test --manifest-path=$(srcdir)/src/libsds/Cargo.toml --locked + cargo test --manifest-path=$(srcdir)/src/libsds/Cargo.toml else # Just build the tqueue in C.