]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
make.sh: Fixes for rust (1.65)
authorMatthias Fischer <matthias.fischer@ipfire.org>
Thu, 1 Dec 2022 15:01:40 +0000 (16:01 +0100)
committerPeter Müller <peter.mueller@ipfire.org>
Thu, 26 Jan 2023 23:02:34 +0000 (23:02 +0000)
During updating rust to 1.65 I found that 'lfsmake2 rust' appeared
twice and removed the second - obsolete - call.

'rust-cipher' now requires 'rust-crypto-common', but was called later
in the build sequence.
=> Moved 'rust-crypto-common' just before 'rust-cipher'. [Thanks Adolf! ;-)]

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
make.sh

diff --git a/make.sh b/make.sh
index 5ce67b64b4fb9ae5f7004eda75ca94c9ff7b895d..ea5973518da3c700e86a0020f48c0ae101dfa2e1 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1211,7 +1211,6 @@ buildipfire() {
   lfsmake2 libqmi
   lfsmake2 pam
   lfsmake2 c-ares
-  lfsmake2 rust
   lfsmake2 rust-dissimilar
   lfsmake2 rust-cfg-if
   lfsmake2 rust-libc
@@ -1219,6 +1218,7 @@ buildipfire() {
   lfsmake2 rust-typenum
   lfsmake2 rust-version-check
   lfsmake2 rust-generic-array
+  lfsmake2 rust-crypto-common
   lfsmake2 rust-cipher
   lfsmake2 rust-hex
   lfsmake2 rust-unicode-xid
@@ -1245,7 +1245,6 @@ buildipfire() {
   lfsmake2 rust-serde_json
   lfsmake2 rust-synstructure
   lfsmake2 rust-block-buffer
-  lfsmake2 rust-crypto-common
   lfsmake2 rust-digest
   lfsmake2 rust-ppv-lite86
   lfsmake2 rust-rand_core