From patchwork Wed Jan 15 13:26:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223478 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=dIi6WnFd; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySlr2bVVz9sRQ for ; Thu, 16 Jan 2020 00:26:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 49A4684483; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 38NyAOcyDtPf; Wed, 15 Jan 2020 13:26:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 211DB847C4; Wed, 15 Jan 2020 13:26:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 615BA1BF573 for ; Wed, 15 Jan 2020 13:26:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5E11A847C4 for ; Wed, 15 Jan 2020 13:26:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6h-6tAhLmApa for ; Wed, 15 Jan 2020 13:26:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9008E84483 for ; Wed, 15 Jan 2020 13:26:35 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id t14so17844604wmi.5 for ; Wed, 15 Jan 2020 05:26:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1inL378tNDv+rOYRUhucQ9XlENs5/ybutMk/rjp1g7Q=; b=dIi6WnFdpEgBaaFsnV5/6eu/tgd8V+aw1zyn8LhQERweR3BQVfWTx3JYfnOR+nkZvI Qu/j2PLfaqw5keZX/e3ws5tdguWas45UyvV2NTmOCWt40+mFpzdmkloJp9Q+8eu/htgM 7sH5phVsMIBvcQrm/MskC/UaUvLDiHfRQEBzT20bxLMFuaemn9jpJJIAk6NmEor5mOGw SmnxJTudhrx/AiaKvsVwj26ziwmyUrR6It94y08ajr/1ce4BKd//dhwXrc0aOCgaRQ0r 4oXP0/3XNpl/PFqlcKbyT+OWgE6of/wcJOTCGGSf+6tr6j5EvxDHvh05mfpW55W8Z73w celg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1inL378tNDv+rOYRUhucQ9XlENs5/ybutMk/rjp1g7Q=; b=BvZa5S+mHoga3MCEvdCKSh4HNH5E3bRBoWXQQL4iNOBSVSPx510eSD9rGRN+DI1tT8 RXlntyE+9EWtT1jhcEuduiucvGJ5ZGieLfg/hn7f4645sVFWeT50S9VwlZFjErVIbmx/ jsrWMs27sVgHVNh2C64BRsOpcqywkDZfLlzgAMSUe439+5HDJsGhY/KpiN1s5ynxvxTv rHS3lyGhLNUEWm0VjNck+HwYWDnoKppTphpxc4nAFHDvsT0DhoMS9Uvf1fbJE8IpC6gj TET6tsYZurhdsZh9vWeLfwoAQfWJ08zmDcJ9GeroYmrjGj1dyw4rhipuaJ7CbStrZIsV p8oQ== X-Gm-Message-State: APjAAAW/kAKDIw0p1wg7M7OKlMKUys1L8y9W3diGUs0zJ3XqryUhvTe4 FipwdBsFbZ1Ofmvg5Ok/zdfgbJtOAPY= X-Google-Smtp-Source: APXvYqxpbyfjwuL+eVBrS1VTl7WuZYugV20YY10ctwCpU3Yb7oDPi0R/cKfbLNTQpm6xXVbPL8Y24g== X-Received: by 2002:a05:600c:244:: with SMTP id 4mr32106091wmj.40.1579094793569; Wed, 15 Jan 2020 05:26:33 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:33 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:10 +0100 Message-Id: <20200115132617.26604-2-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/9] package/cargo-bin: install if rust-bin selected X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan If host-rust-bin, the pre-built Rust compiler, is selected as a rustc provider, then also install the pre-built cargo binary to be coherent. Also install configuration file, reusing the one from rust package. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- package/cargo-bin/cargo-bin.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 3614f7a53d..4a3d52e43b 100644 --- a/package/cargo-bin/cargo-bin.mk +++ b/package/cargo-bin/cargo-bin.mk @@ -10,4 +10,11 @@ CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz CARGO_BIN_LICENSE = Apache-2.0 or MIT CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT +ifeq ($(BR2_PACKAGE_HOST_RUST_BIN),y) +define HOST_CARGO_BIN_INSTALL_CMDS + $(@D)/install.sh --prefix=$(HOST_DIR) --disable-ldconfig +endef +HOST_CARGO_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG +endif + $(eval $(host-generic-package)) From patchwork Wed Jan 15 13:26:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223482 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=eiYW0LHW; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm03xLTz9sSG for ; Thu, 16 Jan 2020 00:26:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8BA7D86294; Wed, 15 Jan 2020 13:26:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lqIpv+DtwQCN; Wed, 15 Jan 2020 13:26:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1F02E85DF5; Wed, 15 Jan 2020 13:26:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 091C61BF573 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 05C4E86187 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IWMgWd1MtNaE for ; Wed, 15 Jan 2020 13:26:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id AD0C78739E for ; Wed, 15 Jan 2020 13:26:36 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id q9so17889446wmj.5 for ; Wed, 15 Jan 2020 05:26:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ij7tfkhUl6eKizUtMVkJGYgvKqnnQdIFob2QQYcBPSI=; b=eiYW0LHWKaZk/TWrlLEKqZwXNF22hEeUykmVxVRyYKZ3rucO088VrURHUEKd199r9V Rd+dy2mfN5sqk/mE79L1PrRzjCS3gMcxhGO1On0FJVhjTMideI/S/7gHGYpkset+hBwO CuQS4RXFd3cVsaK7oV3g+V4cTjsEYI9c23IHdIjosJGgZkTTrVP7UBmVBv11QI5z7FXl 9/7ikkhsi7Tw+gGxGsm0ircTw1bHogdaa4FDAkb+9pQO/RXWD0PpCGbzH2t5jpMzoGxB MQYtX7mAgwY85fxIoqtfx+e2G9LuMQQgXlg4jO13EWtSZYFZg69GcEVasItp2CBulhUs qQyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ij7tfkhUl6eKizUtMVkJGYgvKqnnQdIFob2QQYcBPSI=; b=ZK4LuAfWDevNJroA1gPJl9tGRKLcKN4q3uayYbqC/yhxDH1Jsj6ChSOx1Q6VyGG23z BrW7s3iLbk1dlCdq5fw+2lFnOCHA//wv3rTPWPNonzy3mJvmR4Ku9uAhCgY0UEZNBmRF Of89bng/uMsRtlbbeLx/1De4SVaqEJ4TE8WrNKoxZDs23mvNbn9kCojvS83SZXKK0PBy 73FuOeYdFBEZP3ad5z7BksbcTd5NRPAB4VoAsXeqPI/f4ALGhBuF5Ul4vNqF80LH3c7s P3M9Dx3o/mZfsM7n66fyGBVlzAVr+Rx2DN4WQn+6+0rs8Zb/t8OQ481YVRt6XHR95nnf lC9Q== X-Gm-Message-State: APjAAAV0CPT6YsgvcMN0rES/LUTlb9L2TJ+eO4K+Zsu+IZS9aarf5w+K Sv67mzF2aEqyT66+tMjV63zl0m0G/i8= X-Google-Smtp-Source: APXvYqz78o+n9gM5HCOxpP91hnRTzAMJ2pMu1b7QC8S99ast+oAj62Pa8BrTZLiMkbQ0Li0VFvOmYQ== X-Received: by 2002:a1c:b7c4:: with SMTP id h187mr33795375wmf.105.1579094794528; Wed, 15 Jan 2020 05:26:34 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:34 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:11 +0100 Message-Id: <20200115132617.26604-3-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/9] package/rust-bin: host variant depends on host-cargo-bin X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan Ensure installation of pre-built cargo binary by adding it to the dependency list of the host variant of the pre-built Rust compiler. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- package/rust-bin/rust-bin.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index a374215e20..bef3102450 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -10,6 +10,7 @@ RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT HOST_RUST_BIN_PROVIDES = host-rustc +HOST_RUST_BIN_DEPENDENCIES = host-cargo-bin HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz From patchwork Wed Jan 15 13:26:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223480 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=W3VabPrP; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySlx5Kcmz9sS9 for ; Thu, 16 Jan 2020 00:26:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C28C6204E7; Wed, 15 Jan 2020 13:26:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0PcrnhWKlUWd; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2474A2041E; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 727C11BF573 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6FC9C820E7 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JPjS9cjCBed2 for ; Wed, 15 Jan 2020 13:26:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 434CD816DB for ; Wed, 15 Jan 2020 13:26:37 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id u2so17823975wmc.3 for ; Wed, 15 Jan 2020 05:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C/HbQswSTeHbwlyZ+GLPOfVV4ooYjEzBqgRfbxAutts=; b=W3VabPrPoinSYBnEub7jSSSFY67Nm14+2SFDbCt/IN470p/wkq80sYTRTtrEivU7oU QgsWWs6rm/6b9zkjPXw3goZGRIDxNKlxqwOK3Fm2S4v6CrdrPcWO1wL+Tgh+MqzMLqQZ 3xdD6YVt4y5Pz7ojDEM9gNMBonTpTcjdRVWyfmVz60a4L2xC6TV8ckO6R1Zf71pYDI4u YK5ih1J9B+J4Y0teFCDJtjgiiaFKiGPMfj+qv+GSRnevvmetNYv0PRcKzT2nCab0zuOw 0SGIzsuIN7FSzvzmMCSF89uYJaBQeGzoSKHe8OBg96zpHAhYj4vd0w2L8NE7bb+cbFgA 158w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C/HbQswSTeHbwlyZ+GLPOfVV4ooYjEzBqgRfbxAutts=; b=Uvq47gKPWpVXKGcvgqPk9Tg6rpFNuRdo49GRGNIF60iIXEDGbw9r8xjANF0NGRRs+r Nl/LsY7WmN6JvFsHqHM+sDrVrLu4x41n1JQjesAc+8A0PZxCLYs5e0tj3s+kOzrAUviR D2SMD2j65HdXwF64MOUyOcSny51gSj8SN2AaaBfQ+DqRHqbQHnFxnLFmIHiWA0/YJh9Y TNgpZZVpzHG+pZYuTr3u2/1gNhJWvx2+HbSpjxor0QzeEjggD59RZ92RHfIiOaVyNOtJ hs+SRdIGl8kLH3dOpwZxrUMO6Xwf140TQTYuOciQApQLaEtJJ6EflyojxcB89RgBL3Xq 5rcQ== X-Gm-Message-State: APjAAAXX+qDi1yVC433rMT4sknwJHFKPJWDdxtxAxhtR1Vx4pJnQUav9 wpxE0h6gkavcK0a1FKFFV0c32gV+2Qo= X-Google-Smtp-Source: APXvYqwBWvsvwNPyFjYphCtz/DTOI7ptM4EiOGmxrcYFJUXKi2qllXp73APKr4SpmwzLd5758ZXYPQ== X-Received: by 2002:a1c:49c2:: with SMTP id w185mr32463499wma.138.1579094795401; Wed, 15 Jan 2020 05:26:35 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:34 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:12 +0100 Message-Id: <20200115132617.26604-4-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/9] package/rust: drop dependency on host-cargo-bin X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan As host-rust depends on host-rust-bin, which depends on host-cargo-bin, remove unneeded dependency. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- package/rust/rust.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 901995c203..50ed08901c 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -15,7 +15,6 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ host-rust-bin \ - host-cargo-bin \ host-openssl \ host-python \ $(BR2_CMAKE_HOST_DEPENDENCY) From patchwork Wed Jan 15 13:26:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223483 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=X41bjJk7; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm1646hz9sSP for ; Thu, 16 Jan 2020 00:26:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 26CB32042B; Wed, 15 Jan 2020 13:26:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jY8rffKKXKzo; Wed, 15 Jan 2020 13:26:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 43F27204AD; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E277F1BF573 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DFBA584F61 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RBGi6D9TbINU for ; Wed, 15 Jan 2020 13:26:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DCC88844BD for ; Wed, 15 Jan 2020 13:26:37 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id b19so17850932wmj.4 for ; Wed, 15 Jan 2020 05:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sse+uU445a5rWD5tUEYXXIs26WzNde8Ix7fSJmoZSOw=; b=X41bjJk74j7YHpkAsP2+MkMlZncb1+oGfEm14KwrLMuA2I7uvKzJWgzJ0nsqm+qEoJ QJoHE9++4GzJARTatKqdIfT3kEviDEeQNUcDAwGe999muYWKiyw+0Xcn7qclPaQa2r45 pd7DuhSLNtq8N82xbJYMuURfJKby4nSI4xfY9rekMOqqdMzWyDhGKFptYOcKr+jyPKsT 083dBAochX+NHq/h7l97QUVLywF8h5qzGUM5YbqVBUKJ5oFUriXQTMNP8fuY3KoCWQS9 4I1L7ErxyyDdxQCL5X21A6dlygRo7d/XRLHJB4rmVh2yLffNdBqTBxCIZljXwuVSzAJF FrJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sse+uU445a5rWD5tUEYXXIs26WzNde8Ix7fSJmoZSOw=; b=BY81r22BGVIBVrBlN1H/U13tQnQTO4FYr/hsFmmXSv2pWSoCPb9bq4GaaP6gjOoB+D EWISxk6EN6EQPfmSeb5gcHtQ85rOZDNtKAzxS0jbBlxNoqtiXJC51svviUJNU7JoXXvo FNZDGuVzLw3uqrxlJX0roA3oD+IANfTiNKUN31gaMiW0vgmb+rxl6jZB3CYb6uU1fERs xSFsazwEvyuxGLgMIE2K1q9oHWG+HTZcSxlvmHdn0z4VE1zWMDetfEiEindPpgClsEus GlVH3Gs3yuzOElvSuDUpFNQUqTSi2nOIbnqCMYfIssWMjJh3MUEU1bs6urAnjE8WSyJr ZyBg== X-Gm-Message-State: APjAAAVaSfm0274XnmoU5kBNyiGhnHvcp6JdWoeCLO8N3s27zqSdkpQg QP/PRJDMH+BFqhojbQCi3J52LhfVEGo= X-Google-Smtp-Source: APXvYqx9T/Wu64Sv8OxVMpQxAAAEBAv+soKY2sbVkXked5p0nRlg52Ab65s/f8dI4PNDhCoSy0k7YQ== X-Received: by 2002:a7b:c10f:: with SMTP id w15mr32504478wmi.69.1579094796199; Wed, 15 Jan 2020 05:26:36 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:35 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:13 +0100 Message-Id: <20200115132617.26604-5-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 5/9] package/ripgrep: depends on host-rustc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan As all providers of rustc also install cargo, there is no need to depend on the standalone cargo package anymore. Instead add host-rustc to the dependency list. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- Changes v1 -> v2: - ripgrep/Config.in still needs to select HOST_RUSTC --- package/ripgrep/Config.in | 2 +- package/ripgrep/ripgrep.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ripgrep/Config.in b/package/ripgrep/Config.in index 5446ad046c..0ea2902b34 100644 --- a/package/ripgrep/Config.in +++ b/package/ripgrep/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RIPGREP bool "ripgrep" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_CARGO + select BR2_PACKAGE_HOST_RUSTC help ripgrep is a line-oriented search tool that recursively searches your current directory diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 0bb7017a96..832c076f26 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -9,7 +9,7 @@ RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT -RIPGREP_DEPENDENCIES = host-cargo +RIPGREP_DEPENDENCIES = host-rustc RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo RIPGREP_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) From patchwork Wed Jan 15 13:26:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223486 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=IOZh9qrt; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm71fmPz9sRV for ; Thu, 16 Jan 2020 00:27:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AFE7E2041E; Wed, 15 Jan 2020 13:27:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BwwfiQvLY9m4; Wed, 15 Jan 2020 13:26:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 879CA20428; Wed, 15 Jan 2020 13:26:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B1B501BF983 for ; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A9C4282709 for ; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mZ2eH6zB2LkD for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 115CD8155A for ; Wed, 15 Jan 2020 13:26:39 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id f129so17860759wmf.2 for ; Wed, 15 Jan 2020 05:26:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1KkjUt44ofWEeNaE4HPbB1b+ucPLIiyJqQ1z4f2GCns=; b=IOZh9qrtGewc9IdxoT/NaUmaGCkggFu34eQR2ruhLvwz3RNvNMKHoSmCHZgCTT/JHl LZPe3vT3a0Ql+nVHfhg/dPnBbqTUKmYrPnWq4PgNsaJYDkcXPBQrVsAHpn6hkFu2LYIX SFE63zSQsIShT6XVXn0//pQoLRZPA5P7Jao5AhWKfAhPY9PUDM9rKKvGWVZOxSqZyI1n GU2Tue5CR1Z8jnY+G8Ev0J+ze4jIJIQSge6i6+wt89oSLm35DcnJeLkIHqIkOXD9s0iR j6x6T6iXGdHmObnQ4e3swB2UaGMapRQHTpVqxSgEZBNMUtxPsBUGdjQU5AfxpdxbR5/l lpUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1KkjUt44ofWEeNaE4HPbB1b+ucPLIiyJqQ1z4f2GCns=; b=hiLQVBXlATif44B9vFM17d4E6IllGdDbYwfBcAGBQfJXl1svshcckbVirfWGBzwQyL UfsBRuF8icJ1zmD5sHfovsukLXzW539nDJ4OoepLwNVzTH9z8oVGnQA8rZsUQIKdfZJ0 WjVCfiIoI4pILTMJfLDKF8fI119PwwTTN8rW+d658RNUWwE0axZqNhNsZ90JgcoFnnqR azaXsKLo1qqOq+gdvnE1HN/8ZArG5as3PkHeBZg7E40puN8vyNr2AVyC9wj1OIScgXph hYZDC8nT+mLKKAVHmAvDUSvBYFGes+0f2MGJ53YEuBVFxyxiCLG0Jd1v/Ksrd7iAiIwd 9Btg== X-Gm-Message-State: APjAAAWoY3zS3RcdEohvEmhPC4Nd7Z21xdjOJME9UUTUrR+iLSsjmKqP GDuIOp4aD8xGcuOnk+B0ZT4eMsfxzts= X-Google-Smtp-Source: APXvYqxU3B0bmWzAEnbawoTPyBC9xeAD7450k3Tfq6B2yVpO8phNfdooIy1f448gfCR0bUeU93Oipw== X-Received: by 2002:a1c:f31a:: with SMTP id q26mr32864008wmq.142.1579094797234; Wed, 15 Jan 2020 05:26:37 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:36 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:14 +0100 Message-Id: <20200115132617.26604-6-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 6/9] package/cargo: drop package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan As no package depends on the standalone cargo package, it can be dropped. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- Changes v1 -> v2: - Also update DEVELOPERS file - Also update tests/package/test_rust.py --- DEVELOPERS | 1 - package/Config.in.host | 1 - package/cargo/Config.in.host | 9 --- package/cargo/cargo.hash | 8 -- package/cargo/cargo.mk | 91 ---------------------- package/cargo/config.in | 2 - support/testing/tests/package/test_rust.py | 2 - 7 files changed, 114 deletions(-) delete mode 100644 package/cargo/Config.in.host delete mode 100644 package/cargo/cargo.hash delete mode 100644 package/cargo/cargo.mk delete mode 100644 package/cargo/config.in diff --git a/DEVELOPERS b/DEVELOPERS index 5652fc3555..aca4fd2506 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -707,7 +707,6 @@ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ F: package/cargo-bin/ -F: package/cargo/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ diff --git a/package/Config.in.host b/package/Config.in.host index 62e860d7c3..d69961e813 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -3,7 +3,6 @@ menu "Host utilities" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" source "package/btrfs-progs/Config.in.host" - source "package/cargo/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" diff --git a/package/cargo/Config.in.host b/package/cargo/Config.in.host deleted file mode 100644 index c33c6851f2..0000000000 --- a/package/cargo/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_CARGO - bool "host cargo" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_RUSTC - help - Cargo is the package manager for the Rust programming - language. - - https://crates.io/ diff --git a/package/cargo/cargo.hash b/package/cargo/cargo.hash deleted file mode 100644 index baa2cfbc33..0000000000 --- a/package/cargo/cargo.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Locally generated -sha256 1a4bae6910ca895157a1abe8225eb2b7e9b49ee1ee1e4e72fb81cb8e1446bff9 cargo-0.26.0.tar.gz -sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY -# From https://src.fedoraproject.org/repo/pkgs/cargo/cargo-0.26.0-vendor.tar.xz/sha512 -sha512 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 cargo-0.26.0-vendor.tar.xz diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk deleted file mode 100644 index a387281b4c..0000000000 --- a/package/cargo/cargo.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# cargo -# -################################################################################ - -CARGO_VERSION = 0.26.0 -CARGO_SITE = $(call github,rust-lang,cargo,$(CARGO_VERSION)) -CARGO_LICENSE = Apache-2.0 or MIT -CARGO_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - -CARGO_DEPS_SHA512 = 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 -CARGO_DEPS_SITE = https://src.fedoraproject.org/repo/pkgs/cargo/$(CARGO_DEPS_SOURCE)/sha512/$(CARGO_DEPS_SHA512) -CARGO_DEPS_SOURCE = cargo-$(CARGO_VERSION)-vendor.tar.xz - -CARGO_INSTALLER_VERSION = 4f994850808a572e2cc8d43f968893c8e942e9bf -CARGO_INSTALLER_SITE = $(call github,rust-lang,rust-installer,$(CARGO_INSTALLER_VERSION)) -CARGO_INSTALLER_SOURCE = rust-installer-$(CARGO_INSTALLER_VERSION).tar.gz - -HOST_CARGO_EXTRA_DOWNLOADS = \ - $(CARGO_DEPS_SITE)/$(CARGO_DEPS_SOURCE) \ - $(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE) - -HOST_CARGO_DEPENDENCIES = \ - $(BR2_CMAKE_HOST_DEPENDENCY) \ - host-pkgconf \ - host-openssl \ - host-libhttpparser \ - host-libssh2 \ - host-libcurl \ - host-rustc \ - host-cargo-bin - -HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo -HOST_CARGO_HOME = $(HOST_DIR)/share/cargo - -define HOST_CARGO_EXTRACT_DEPS - @mkdir -p $(@D)/vendor - $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS - -define HOST_CARGO_EXTRACT_INSTALLER - @mkdir -p $(@D)/src/rust-installer - $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER - -define HOST_CARGO_SETUP_DEPS - mkdir -p $(@D)/.cargo - ( \ - echo "[source.crates-io]"; \ - echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \ - echo "replace-with = 'vendored-sources'"; \ - echo "[source.vendored-sources]"; \ - echo "directory = '$(@D)/vendor'"; \ - ) > $(@D)/.cargo/config -endef - -HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS - -HOST_CARGO_SNAP_OPTS = \ - --release \ - $(if $(VERBOSE),--verbose) - -HOST_CARGO_ENV = \ - RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \ - CARGO_HOME=$(HOST_CARGO_HOME) - -define HOST_CARGO_BUILD_CMDS - (cd $(@D); $(HOST_MAKE_ENV) $(HOST_CARGO_ENV) $(HOST_CARGO_SNAP_BIN) \ - build $(HOST_CARGO_SNAP_OPTS)) -endef - -define HOST_CARGO_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo - $(INSTALL) -D package/cargo/config.in \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ - $(HOST_DIR)/share/cargo/config -endef - -$(eval $(host-generic-package)) diff --git a/package/cargo/config.in b/package/cargo/config.in deleted file mode 100644 index 47fad026be..0000000000 --- a/package/cargo/config.in +++ /dev/null @@ -1,2 +0,0 @@ -[target.@RUSTC_TARGET_NAME@] -linker = "@CROSS_PREFIX@gcc" diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 9854c3692e..15bb93dd97 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -73,7 +73,6 @@ class TestRustBin(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y """ @@ -102,7 +101,6 @@ class TestRust(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y """ From patchwork Wed Jan 15 13:26:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223485 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=gjC6wwuq; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm46whZz9sSZ for ; Thu, 16 Jan 2020 00:27:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58CE9844BD; Wed, 15 Jan 2020 13:26:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id svcOGvc8Krwa; Wed, 15 Jan 2020 13:26:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3003485E0B; Wed, 15 Jan 2020 13:26:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A99B21BF983 for ; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A57E02042B for ; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id py7ssMF0-u5h for ; Wed, 15 Jan 2020 13:26:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by silver.osuosl.org (Postfix) with ESMTPS id 65598203C8 for ; Wed, 15 Jan 2020 13:26:40 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id q10so15731163wrm.11 for ; Wed, 15 Jan 2020 05:26:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Terpt/mM11yPaI6Sf9NorY6nd2mOeez1V9qMn92cbiA=; b=gjC6wwuqr2jX9IKhq35dE9erU4Rlbr927MayiApgB2GiWg6N5KffRd9v6knHvFrBH0 RBRb1r+/vvssRNNUMa4grH02hcZofvvXU8YQ/jsiRycUez2MRvtdptCWY01DmBLpGbV4 7VephqEzKDbPUuJ9xG63D0Ps20Tkq42NlTz06KC2P+1r5ycHVUV0XLMnzbLa0erW7YU/ ntPHZkxaZEzSS7Whj9uI5ZDySbulHV3mzWmmOwL2iVzlpWo7todh4Cw1IuTD0cY4sgBp JUKR7kT2FGdjXODca9y0pgeZuJdXeqIAeTALlYF0Lkjorz9aIxL0No1XRqG1DmFHdmhV 0A6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Terpt/mM11yPaI6Sf9NorY6nd2mOeez1V9qMn92cbiA=; b=DKh5DTWbl8SsZP/uJgJqCBMrWXjDDYXX8gvaKY9EDZhA8tvuQFhc76xm0U/Ok2vGiA P/3CW79KtIcOujMU8iLRielSEDHJOKL0leHN8PeCYrFwIgbfjNVdwpCiOCjOFxy9PppU 62Gg834JoO1xVIuMsQEwrcrqf6Zlg0OwJwL5Hwx7kGZTRN3M20bxCwnZCY0pqicj2UP1 skcI9d73MvSZj733mIMWPqYY2moaYOmSAu8uQnlxnFpsX1f2E42pS2ZXaXEzPRpbH3gl axLDyD6uL1D9HQ0tuUI/fRCDQjQUV6lm5krJjj11Khw4dG7bhEGTUcPP5tBnXYuYi1+m 7ysg== X-Gm-Message-State: APjAAAWsHUFOGHDHSRoW7CIbvVHzYrjXUlP/i+rSQncxXHSvY+rAIUkL CZkA3YnrDxRHbOIiqp4zYFwHZAmsvNI= X-Google-Smtp-Source: APXvYqzDPmShFMdRt9c6Agq7UIZ7XMhvemW3FmaZp2I+wOw8enCymJbecEs7TNkGucIeeHg0qvYS0g== X-Received: by 2002:adf:9427:: with SMTP id 36mr4156176wrq.166.1579094798051; Wed, 15 Jan 2020 05:26:38 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:37 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:15 +0100 Message-Id: <20200115132617.26604-7-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 7/9] docs/manual: cargo packages depend on host-rustc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan As Cargo is either installed by host-rust or host-rust-bin, the Cargo-based packages should depend on host-rustc. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange --- docs/manual/adding-packages-cargo.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index b6029e1eed..b83f86e9e6 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -18,11 +18,10 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 01: config BR2_PACKAGE_FOO 02: bool "foo" 03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS -04: select BR2_PACKAGE_HOST_CARGO -05: help -06: This is a comment that explains what foo is. -07: -08: http://foosoftware.org/foo/ +04: help +05: This is a comment that explains what foo is. +06: +07: http://foosoftware.org/foo/ --------------------------- ==== Cargo-based package's +.mk+ file @@ -44,7 +43,7 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-cargo +13: FOO_DEPENDENCIES = host-rustc 14: 15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo 16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) From patchwork Wed Jan 15 13:26:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223481 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=NEvWsPJq; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm11HB9z9sSK for ; Thu, 16 Jan 2020 00:26:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 039AA85E79; Wed, 15 Jan 2020 13:26:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X_CDPAWvGNuF; Wed, 15 Jan 2020 13:26:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1B0EA84F61; Wed, 15 Jan 2020 13:26:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 95EB31BF573 for ; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 895F7847C4 for ; Wed, 15 Jan 2020 13:26:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Aoqq5oEy0114 for ; Wed, 15 Jan 2020 13:26:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3750E84E42 for ; Wed, 15 Jan 2020 13:26:41 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id f129so17860870wmf.2 for ; Wed, 15 Jan 2020 05:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jCb7JCuSzLzzl4/x5RWo/xwEqhz4FJERZbEijaoEhj4=; b=NEvWsPJqj5ndinrYzj0giDUdOI3xaM7i7jJQ8k6GmvudR/GG+LvTXBrbFRibnJNK6c rSz8X7iC+w4hP8U5ftJiISEOPYCT/8MSjL8Fqe971JqXZLvew95XMp6Xsxa4slaOGSMp rdKqdXAGZZQ4ghqZ7BE9UfqL08CeX6boV5k7sJlh9N9LMXm7GbO6zMELSZSu2x1D3nE0 0cL55W4FBdDKGoM7H4cDvUJ8NuDz0DYoHb7aoD+hQ9lEr8mEKw/3kSrCBCZte/K/O+5a 55Z7us7UKdc4SePgx+Bikh1yIcBh8SS/iu93iR1n2IlDWqOJNE1udqjSsATE12sdbvGS QX8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jCb7JCuSzLzzl4/x5RWo/xwEqhz4FJERZbEijaoEhj4=; b=HIU55wMZo4IydpOXNkSF4fA6GtZb9SWozB/zsf7r7/803xEKBNJ3Ai5Pli+eDFCufq vlJusUyeA8AH5aPaPQIKWJ8o9opnCqUQHCLup0yLbuiE1bUQVZMIpWvB24DrQKEf5Hf4 9TWMfTvR8JlnEfwiW6TYvBqRVc6YyfiS9i2mM9qN1iH2Fydlic8H2QUWsERxs+8ZRDjw C/iAaWVgMUvFLluz97kwJWpc55hEraBy/EOSWnzeIeMPQo6Qi+PNnh5HDcgvotnmunzm MmLf26gsVfaUs56TxGy6kbEUvuZGWBdsDOgEcputmudcEJFzBtY8ulqMS08EXGqB+Abr SVYg== X-Gm-Message-State: APjAAAW7MNPXjh0NPYe081vJTgNVeZSZyUwvWz1F0gRVDWdX9rCvdDji QbEn7eXxh6c6cb0OjuaT7TqeR+679MQ= X-Google-Smtp-Source: APXvYqzQuXGZJBxp8OYL7FB2A5AimUj4/UGfZkKJi/yOOwsCRvHK/tfWsvDRNoWjXukP4+jP64+uww== X-Received: by 2002:a05:600c:2409:: with SMTP id 9mr31458832wmp.109.1579094798930; Wed, 15 Jan 2020 05:26:38 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:38 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:16 +0100 Message-Id: <20200115132617.26604-8-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 8/9] package/rust: bump to 1.40 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - remove of the llvm workaround patch as it is integrated in this newer version. - bump cargo-bin to 0.41 (corresponds to rust 1.40) and update licenses hashes. - bump rust-bin to 1.40. Signed-off-by: Patrick Havelange --- package/cargo-bin/cargo-bin.hash | 22 +- package/cargo-bin/cargo-bin.mk | 2 +- package/rust-bin/rust-bin.hash | 90 +++--- package/rust-bin/rust-bin.mk | 2 +- ...esence-of-LLVM-library-in-stage0-lib.patch | 264 ------------------ package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 7 files changed, 62 insertions(+), 326 deletions(-) delete mode 100644 package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash index 0e9e9c5c61..22cad3c0ee 100644 --- a/package/cargo-bin/cargo-bin.hash +++ b/package/cargo-bin/cargo-bin.hash @@ -1,13 +1,13 @@ -# From https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32 cargo-0.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 6628db22370f397676195555d768f0449a60f0a694bcac24611f4cd1cfc97cdc cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761 cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 c48bc132f4025ff39b1b6dc52aef9d406c3f926ce05fe92d943ceab7a5fd6058 cargo-0.41.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 7705f21d938a72ba6f01818661b2dea29183209940a335f18d1761e1e03d3710 cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE +sha256 8ada45cd9f843acf64e4722ae262c622a2b3b3007c7310ef36ac1061a30f6adb LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY +sha256 cbc759b1f17a2ac38fe3eb9e9563b1a08ba0f900611c49faaf68b46907b6d898 LICENSE-THIRD-PARTY diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 4a3d52e43b..09dd58e3df 100644 --- a/package/cargo-bin/cargo-bin.mk +++ b/package/cargo-bin/cargo-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CARGO_BIN_VERSION = 0.33.0 +CARGO_BIN_VERSION = 0.41.0 CARGO_BIN_SITE = https://static.rust-lang.org/dist CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz CARGO_BIN_LICENSE = Apache-2.0 or MIT diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 96d81a347c..12195f2911 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,48 +1,48 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63 rustc-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1 rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7 rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6 rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5 rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e945dd37ab9b143dbcbcdbeaba63b8de47411a4ff815d2e178f745e183078127 rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 abf6b7050c1cdef092ecfde5128067434bb7989def19cfe95c06bfd71de07ba0 rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 9cad816c989c991ffd342d03956b54209d7d32743ebb9b0624b2d36d5bbd525f rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 c7ac98e7a7c3757b5bb8bde596455d50a8787236e290bc1f49e2d59d486ae564 rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 4ec3cade12e2e527f81d0b315e6a37152bf73938aab4a9216aef7d06ef913eb6 rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 0ab78e0cb710f35d108abce90bbf426947fed6222d2f6c04c9eba4ca00adea06 rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 257e4789043098a5e3b4fa85ea988019f37d640a10f83d39ada00fb23e057b8a rustc-1.40.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111 rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 1abd1865e8339c2cac6992a11f6f98b66fa2b97f67acaddcf1992e39a7001bfc rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 14bd261dfc586dc8e1cb336b3c58b63de2af4881c970dd9b1e87f1364a866bcb rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 f16b2cf9103127140f85d21c2753d85d45b90a9309967e3a788867fd7d95a6c1 rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9d4aad78db894a76e9682f2095ac024cc4748b2933f9f7248bf571923f7693c4 rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 beab29565d12a6b9db4ef471c34d4c034295760095f7edc3f7b6c51fc08589a0 rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 c25790d43e0a01e5f45607b067b22ae96163d5eae877cee1b2b35ce0d43ab9b5 rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 7000ab95cd64f177af831d8880b9a5d7b5a23e5a18b9e9adab32bf90859bfa4e rust-std-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 9a4cfebee845dfd50f0f10c3019b89af3747c3aed1a797042285f3cea5a3eb30 rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 ab738a37c1cac1aaec7cb34556fa9bfff46dc912baf360a27e9d81311120ec4a rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 5c29b326d4d564c9fa9b82292890f47794496d3cedf106f83f935189b7ecaca5 rust-std-1.40.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 da7af341b3a01f684a2d9fea23f098816aa8a0f9588b58d25ec7f0622743b5b0 rust-std-1.40.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 4eb3141fb6c3d3e101b5d4493664c9a01d4bb9eebdf4b96f5c26a81188c2452d rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bef3102450..a5966768a4 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.33.0 +RUST_BIN_VERSION = 1.40.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch b/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch deleted file mode 100644 index 0c756e3028..0000000000 --- a/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 2d21df8a3fd7a68ba9f52389ead7f06f13190c12 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Mon, 21 Jan 2019 17:47:57 -0700 -Subject: [PATCH] Workaround presence of LLVM library in stage0/lib - -This commit works around the newly-introduced LLVM shared library. - -This is needed such that llvm-config run from -librustc_llvm's build script can correctly locate it's own LLVM, not the -one in stage0/lib. The LLVM build system uses the DT_RUNPATH/RUNPATH -header within the llvm-config binary, which we want to use, but because -Cargo always adds the host compiler's "libdir" (stage0/lib in our -case) to the dynamic linker's search path, we weren't properly finding -the freshly-built LLVM in llvm/lib. By restoring the environment -variable setting the search path to what bootstrap sees, the problem is -resolved and librustc_llvm correctly links and finds the appropriate -LLVM. - -Several run-make-fulldeps tests are also updated with similar handling. - -Signed-off-by: Eric Le Bihan ---- - src/bootstrap/builder.rs | 9 ++++++++- - src/bootstrap/compile.rs | 1 + - src/bootstrap/util.rs | 6 +++++- - src/build_helper/lib.rs | 19 +++++++++++++++++++ - src/librustc_asan/build.rs | 2 ++ - src/librustc_llvm/build.rs | 2 ++ - src/librustc_lsan/build.rs | 2 ++ - src/librustc_msan/build.rs | 2 ++ - src/librustc_tsan/build.rs | 2 ++ - .../cross-lang-lto-upstream-rlibs/Makefile | 4 ++-- - .../run-make-fulldeps/cross-lang-lto/Makefile | 19 ++++++++++--------- - 11 files changed, 55 insertions(+), 13 deletions(-) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index a69ba20749..f742bce180 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -21,7 +21,7 @@ use crate::install; - use crate::native; - use crate::test; - use crate::tool; --use crate::util::{add_lib_path, exe, libdir}; -+use crate::util::{self, add_lib_path, exe, libdir}; - use crate::{Build, DocTests, Mode, GitRepo}; - - pub use crate::Compiler; -@@ -791,6 +791,13 @@ impl<'a> Builder<'a> { - .env("CARGO_TARGET_DIR", out_dir) - .arg(cmd); - -+ // See comment in librustc_llvm/build.rs for why this is necessary, largely llvm-config -+ // needs to not accidentally link to libLLVM in stage0/lib. -+ cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var()); -+ if let Some(e) = env::var_os(util::dylib_path_var()) { -+ cargo.env("REAL_LIBRARY_PATH", e); -+ } -+ - if cmd != "install" { - cargo.arg("--target") - .arg(target); -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index b581271663..ec04dee6c3 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -712,6 +712,7 @@ pub fn build_codegen_backend(builder: &Builder, - if builder.is_rust_llvm(target) && backend != "emscripten" { - cargo.env("LLVM_RUSTLLVM", "1"); - } -+ - cargo.env("LLVM_CONFIG", &llvm_config); - if backend != "emscripten" { - let target_config = builder.config.target_config.get(&target); -diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs -index 2880f1a084..37c6c040da 100644 ---- a/src/bootstrap/util.rs -+++ b/src/bootstrap/util.rs -@@ -70,7 +70,11 @@ pub fn dylib_path_var() -> &'static str { - /// Parses the `dylib_path_var()` environment variable, returning a list of - /// paths that are members of this lookup path. - pub fn dylib_path() -> Vec { -- env::split_paths(&env::var_os(dylib_path_var()).unwrap_or_default()).collect() -+ let var = match env::var_os(dylib_path_var()) { -+ Some(v) => v, -+ None => return vec![], -+ }; -+ env::split_paths(&var).collect() - } - - /// `push` all components to `buf`. On windows, append `.exe` to the last component. -diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs -index 5a704e5577..c66c5c9249 100644 ---- a/src/build_helper/lib.rs -+++ b/src/build_helper/lib.rs -@@ -23,6 +23,25 @@ macro_rules! t { - }; - } - -+// Because Cargo adds the compiler's dylib path to our library search path, llvm-config may -+// break: the dylib path for the compiler, as of this writing, contains a copy of the LLVM -+// shared library, which means that when our freshly built llvm-config goes to load it's -+// associated LLVM, it actually loads the compiler's LLVM. In particular when building the first -+// compiler (i.e., in stage 0) that's a problem, as the compiler's LLVM is likely different from -+// the one we want to use. As such, we restore the environment to what bootstrap saw. This isn't -+// perfect -- we might actually want to see something from Cargo's added library paths -- but -+// for now it works. -+pub fn restore_library_path() { -+ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR"); -+ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH"); -+ let key = env::var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR"); -+ if let Some(env) = env::var_os("REAL_LIBRARY_PATH") { -+ env::set_var(&key, &env); -+ } else { -+ env::remove_var(&key); -+ } -+} -+ - pub fn run(cmd: &mut Command) { - println!("running: {:?}", cmd); - run_silent(cmd); -diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs -index 2d921b6669..b42d775deb 100644 ---- a/src/librustc_asan/build.rs -+++ b/src/librustc_asan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("asan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs -index ec3dff783c..cd91fcb299 100644 ---- a/src/librustc_llvm/build.rs -+++ b/src/librustc_llvm/build.rs -@@ -24,6 +24,8 @@ fn main() { - return; - } - -+ build_helper::restore_library_path(); -+ - let target = env::var("TARGET").expect("TARGET was not set"); - let llvm_config = env::var_os("LLVM_CONFIG") - .map(PathBuf::from) -diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs -index 470f2bb3e5..ad528bb039 100644 ---- a/src/librustc_lsan/build.rs -+++ b/src/librustc_lsan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("lsan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs -index e1140278f2..085514b5a0 100644 ---- a/src/librustc_msan/build.rs -+++ b/src/librustc_msan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("msan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs -index f63bb46b87..0db3db392d 100644 ---- a/src/librustc_tsan/build.rs -+++ b/src/librustc_tsan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("tsan") { - Ok(native) => native, - _ => return, -diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -index 0a6f226a02..6992dab1a1 100644 ---- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -+++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -@@ -9,7 +9,7 @@ all: staticlib.rs upstream.rs - - # Check No LTO - $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -L. -o $(TMPDIR)/staticlib.a -- (cd $(TMPDIR); llvm-ar x ./staticlib.a) -+ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) - # Make sure the upstream object file was included - ls $(TMPDIR)/upstream.*.rcgu.o - -@@ -19,5 +19,5 @@ all: staticlib.rs upstream.rs - # Check ThinLTO - $(RUSTC) upstream.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin - $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a -- (cd $(TMPDIR); llvm-ar x ./staticlib.a) -+ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) - ls $(TMPDIR)/upstream.*.rcgu.o -diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile -index 1d072e03de..4d1fb7b953 100644 ---- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile -+++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile -@@ -5,8 +5,9 @@ - # LLVM bitcode files (as used by linker LTO plugins) when compiling with - # -Z cross-lang-lto. - --ASSERT_IS_BITCODE_OBJ=llvm-bcanalyzer # this only succeeds for bitcode files --EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; llvm-ar x $(1)) -+# this only succeeds for bitcode files -+ASSERT_IS_BITCODE_OBJ=($(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-bcanalyzer $(1)) -+EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x $(1)) - - BUILD_LIB=$(RUSTC) lib.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 - BUILD_EXE=$(RUSTC) main.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 --emit=obj -@@ -16,31 +17,31 @@ all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib - staticlib: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a - $(call EXTRACT_OBJS, liblib.a) -- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - staticlib-fat-lto: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-fat-lto.a -Clto=fat - $(call EXTRACT_OBJS, liblib-fat-lto.a) -- for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - staticlib-thin-lto: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-thin-lto.a -Clto=thin - $(call EXTRACT_OBJS, liblib-thin-lto.a) -- for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - rlib: lib.rs - $(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib - $(call EXTRACT_OBJS, liblib.rlib) -- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - cdylib: lib.rs - $(BUILD_LIB) --crate-type=cdylib --emit=obj -o $(TMPDIR)/cdylib.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/cdylib.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/cdylib.o) - - rdylib: lib.rs - $(BUILD_LIB) --crate-type=dylib --emit=obj -o $(TMPDIR)/rdylib.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/rdylib.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/rdylib.o) - - exe: lib.rs - $(BUILD_EXE) -o $(TMPDIR)/exe.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/exe.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o) --- -2.17.2 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 62e2e1855c..67c537f670 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.asc -sha256 f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71 rustc-1.33.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz.asc +sha256 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace rustc-1.40.0-src.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 50ed08901c..e5d0e2ee71 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.33.0 +RUST_VERSION = 1.40.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From patchwork Wed Jan 15 13:26:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Havelange X-Patchwork-Id: 1223484 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=essensium.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=eJ2YmL85; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ySm350xXz9sST for ; Thu, 16 Jan 2020 00:26:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DC16386378; Wed, 15 Jan 2020 13:26:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qx2aqx-Gb1Mz; Wed, 15 Jan 2020 13:26:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E634386230; Wed, 15 Jan 2020 13:26:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AE5891BF573 for ; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A6331204CC for ; Wed, 15 Jan 2020 13:26:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pklzj8GaG2-U for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by silver.osuosl.org (Postfix) with ESMTPS id 0E5C4203D0 for ; Wed, 15 Jan 2020 13:26:42 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id z3so15753821wru.3 for ; Wed, 15 Jan 2020 05:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SHrlERho1VcPAXdj6JQ/XBb2bR9NuEjQp3pRgvO1+nQ=; b=eJ2YmL85g/WwAV9U8FtAM3/s0foJeyVK1KRPdbS5h+5qteY9/QEzQ+tJw+UjkoyYMp bkkt5ODZf7bJ0pq+wcbvBZ+cV4vqOBNePhDd+Vthhf2HEvoq0TvWW5sV5YwFEupMAVC1 0TQnFdzPavZ1TyaJ4zRc6/Ndz4K7pOwEpNiq5BWqNJpzYqRYc8tGb59sQq4T94MUvc4S nzN1qzzNTpoNr/zZRwPGfWgfqAf+cSBGT5mf42CcunIjwdIUDCJc38zVNuq8ZGoImTpC pqAYtRmM/i4PEqEYiFFTugABKTsYWFNTnHAoSlIexi0I/13b8/uLPxg2d0SsrMmVo/H9 5n3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SHrlERho1VcPAXdj6JQ/XBb2bR9NuEjQp3pRgvO1+nQ=; b=I8496oZkTSvGdSZj3D86HnGkz7YfOroEdhGoOTOzS0XgitdgOQ8XHMN0j91zUcRNfq vYWw+odrm/smK2WquF4u3QO1VpfYeoKZtZO1IUnOQ9sqCy+KI4bZ/cLWowmQOVv3Ocxt aAQbw0mtws16TivQgDA0Vqhu/7kLKfoL7POsIXCmLqqnjZ8wGTCQj/GyUr/VFVvhRLiQ 5yTUqaxZRkP7IUc6OW1mEp5POnLpVRPR7prfWPumtgM/Wj+4ACQahh48WtJB38JW3Lam 8b9gtjJ4j5OZSaBWcycs8m9fEl/DMFmyzz2srGanhDsbeAkVVK/sb3Ri2lSemXGEH1bN Tbug== X-Gm-Message-State: APjAAAU90MwH73opJf6gYe0PMPw57NqnUYsBCScB4hIP+6r16m9+hfXG 4alFYVgvR8ZNr2I1eJ/3ELYteZ+Z2eM= X-Google-Smtp-Source: APXvYqyacDL2l8feGgnHwTeqb6+rbPzV7F9dqAzvD8YGI4bcunrNK1rRewzoN25DFDZzy9t6aRBaxg== X-Received: by 2002:a5d:4fd0:: with SMTP id h16mr30195522wrw.255.1579094800155; Wed, 15 Jan 2020 05:26:40 -0800 (PST) Received: from ph-ThinkPad-E560.local.ess-mail.com (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id 2sm24062027wrq.31.2020.01.15.05.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 05:26:39 -0800 (PST) From: Patrick Havelange To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:17 +0100 Message-Id: <20200115132617.26604-9-patrick.havelange@essensium.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 9/9] package/cargo-bin: remove and use cargo-bin from rust-bin package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange , Sam Voss , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also added hashes for rust-bin powerpc64le. Signed-off-by: Patrick Havelange --- DEVELOPERS | 1 - package/cargo-bin/cargo-bin.hash | 13 ------------- package/cargo-bin/cargo-bin.mk | 20 -------------------- package/rust-bin/rust-bin.hash | 15 +++++++++------ package/rust-bin/rust-bin.mk | 28 ++++++++++++---------------- package/rust/rust.mk | 2 +- 6 files changed, 22 insertions(+), 57 deletions(-) delete mode 100644 package/cargo-bin/cargo-bin.hash delete mode 100644 package/cargo-bin/cargo-bin.mk diff --git a/DEVELOPERS b/DEVELOPERS index aca4fd2506..bd78e100f6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -706,7 +706,6 @@ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ -F: package/cargo-bin/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash deleted file mode 100644 index 22cad3c0ee..0000000000 --- a/package/cargo-bin/cargo-bin.hash +++ /dev/null @@ -1,13 +0,0 @@ -# From https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 c48bc132f4025ff39b1b6dc52aef9d406c3f926ce05fe92d943ceab7a5fd6058 cargo-0.41.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 7705f21d938a72ba6f01818661b2dea29183209940a335f18d1761e1e03d3710 cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz -# Locally generated -sha256 8ada45cd9f843acf64e4722ae262c622a2b3b3007c7310ef36ac1061a30f6adb LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 cbc759b1f17a2ac38fe3eb9e9563b1a08ba0f900611c49faaf68b46907b6d898 LICENSE-THIRD-PARTY diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk deleted file mode 100644 index 09dd58e3df..0000000000 --- a/package/cargo-bin/cargo-bin.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# cargo-bin -# -################################################################################ - -CARGO_BIN_VERSION = 0.41.0 -CARGO_BIN_SITE = https://static.rust-lang.org/dist -CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz -CARGO_BIN_LICENSE = Apache-2.0 or MIT -CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - -ifeq ($(BR2_PACKAGE_HOST_RUST_BIN),y) -define HOST_CARGO_BIN_INSTALL_CMDS - $(@D)/install.sh --prefix=$(HOST_DIR) --disable-ldconfig -endef -HOST_CARGO_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG -endif - -$(eval $(host-generic-package)) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 12195f2911..1fdce9ad6f 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,9 +1,12 @@ -# From https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 257e4789043098a5e3b4fa85ea988019f37d640a10f83d39ada00fb23e057b8a rustc-1.40.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111 rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 82454e1b60b2bc24779d9c949cc0e1da43f3e423dbfc6b45b5afddf65829fc9d rust-1.40.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 37492d6467bcea611b2c7388aed50b655524f81410e255142ef6cfb6cef1ec53 rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 82454e1b60b2bc24779d9c949cc0e1da43f3e423dbfc6b45b5afddf65829fc9d rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.asc sha256 1abd1865e8339c2cac6992a11f6f98b66fa2b97f67acaddcf1992e39a7001bfc rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index a5966768a4..be8d623aa2 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -10,18 +10,14 @@ RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT HOST_RUST_BIN_PROVIDES = host-rustc -HOST_RUST_BIN_DEPENDENCIES = host-cargo-bin -HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz - -HOST_RUST_BIN_EXTRA_DOWNLOADS = \ - rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz +HOST_RUST_BIN_SOURCE = rust-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) -HOST_RUST_BIN_EXTRA_DOWNLOADS += rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz +HOST_RUST_BIN_EXTRA_DOWNLOADS = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz endif -HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME)/rust-std-$(RUSTC_HOST_NAME) +HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUSTC_HOST_NAME) define HOST_RUST_BIN_LIBSTD_EXTRACT mkdir -p $(@D)/std @@ -31,36 +27,36 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT ) mkdir -p $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \ - ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . + ln -sf ../../../../../$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . endef HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT -HOST_RUST_BIN_INSTALL_OPTS = \ +HOST_RUST_BIN_INSTALL_COMMON_OPTS = \ --prefix=$(HOST_DIR) \ --disable-ldconfig +HOST_RUST_BIN_INSTALL_OPTS = \ + $(HOST_RUST_BIN_INSTALL_COMMON_OPTS) \ + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) + define HOST_RUST_BIN_INSTALL_RUSTC (cd $(@D); \ ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) endef -define HOST_RUST_BIN_INSTALL_LIBSTD_HOST - (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) -endef - ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) + ./install.sh $(HOST_RUST_BIN_INSTALL_COMMON_OPTS)) endef endif define HOST_RUST_BIN_INSTALL_CMDS $(HOST_RUST_BIN_INSTALL_RUSTC) - $(HOST_RUST_BIN_INSTALL_LIBSTD_HOST) $(HOST_RUST_BIN_INSTALL_LIBSTD_TARGET) endef +HOST_RUST_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG + $(eval $(host-generic-package)) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index e5d0e2ee71..a473b5e8af 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -41,7 +41,7 @@ define HOST_RUST_CONFIGURE_CMDS ( \ echo '[build]'; \ echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ - echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \ + echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ echo 'python = "$(HOST_DIR)/bin/python2"'; \ echo 'submodules = false'; \