From patchwork Thu Dec 1 15:01:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 6233 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNK6Q5xNtz3whh for ; Thu, 1 Dec 2022 15:01:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNK6N4S0Vz1ZW; Thu, 1 Dec 2022 15:01:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNK6N33Rjz2y4g; Thu, 1 Dec 2022 15:01:48 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNK6L6pJRz2xlq for ; Thu, 1 Dec 2022 15:01:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NNK6K6VQpz1Nq for ; Thu, 1 Dec 2022 15:01:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669906906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MoSbLqa14Jt3f0ugKQjkO9pQgUZ1NBb051pIFPl0M/Y=; b=Xjx4Jrt6SVGmAKN1LwPurweIFq3T6GsakfYcgP74DXA3quKHpAguuw/R+IHXamyNZQjV0p Iesi1lp8DtY47gAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669906906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MoSbLqa14Jt3f0ugKQjkO9pQgUZ1NBb051pIFPl0M/Y=; b=ISM7/Qx9euKw3rLfxX0DTpBq7UoZm8yx4HtI7dqq6pBpzpsCcu3gstkWw0Cpq/RDpNhO/t ujqWCePjdt61GrJlM3yZj2VpOQR5WxqV1/b4ZmA2hFZXlr/MA5HWd1ICT7Kde/H+DZLDqh SwPxiJ39VYQOcNj2GV0tmuSq7gEdKrh0TS3PhKEzkL9l7dAif0Vu0LqjEzvYjMAURUo7dM Jjq19MR7f8H3ZcuHExKgCnONNgFdbmMCQy4pJgMFVYvimeXmHASFNGXQ/Xclhz4LkgauN2 4X7P0MiNd2UQLy3IVAcqFrXSUG9dKowicnKq4kg4dwmviVpC+1yYX+HG2WmYXg== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] make.sh: Fixes for rust (1.65) Date: Thu, 1 Dec 2022 16:01:40 +0100 Message-Id: <20221201150140.2932973-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- make.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/make.sh b/make.sh index 413d04491..e256e2755 100755 --- a/make.sh +++ b/make.sh @@ -1203,7 +1203,6 @@ buildipfire() { lfsmake2 sqlite lfsmake2 libffi lfsmake2 python3 - lfsmake2 rust lfsmake2 rust-dissimilar lfsmake2 rust-cfg-if lfsmake2 rust-libc @@ -1211,6 +1210,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 @@ -1237,7 +1237,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