#50626 Ticket 50617 - disable cargo lock
Merged 2 months ago by firstyear. Opened 2 months ago by firstyear.
firstyear/389-ds-base 50617-disable-cargo-lock  into  master

file modified
+2 -2

@@ -1205,14 +1205,14 @@ 

  

  @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.

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 william@blackhats.net.au

Review by: ???

I'm fine with this as well. We should just be aware that e.g. for Fedora's Koji (CentOS likewise) online builds are not an option AFAIK.

Yep, I'm aware - we'll want offline builds at SUSE too. We need cargo vendor to be in place though so that we can pre-download any libs so we can use --locked in our makefile.

rebased onto 4b987b3

2 months ago

Pull-Request has been merged by firstyear

2 months ago
Metadata