From patchwork Sat Jul 13 12:23:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1960110 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLnhK2zsfz1xqx for ; Sat, 13 Jul 2024 22:24:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BB42880FAE; Sat, 13 Jul 2024 12:24:15 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id pn40KBjKFx2b; Sat, 13 Jul 2024 12:24:14 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 247398102D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 247398102D; Sat, 13 Jul 2024 12:24:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1CAA01BF5AE for ; Sat, 13 Jul 2024 12:23:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1652C400DD for ; Sat, 13 Jul 2024 12:23:59 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id H4z2ok3B0j6R for ; Sat, 13 Jul 2024 12:23:58 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::531; helo=mail-ed1-x531.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org AE766400A4 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org AE766400A4 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by smtp2.osuosl.org (Postfix) with ESMTPS id AE766400A4 for ; Sat, 13 Jul 2024 12:23:57 +0000 (UTC) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-58ba3e37feeso3485888a12.3 for ; Sat, 13 Jul 2024 05:23:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720873435; x=1721478235; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JFavsMiFV1HxEd3u7LnnW6uMxYXzUWtmp/sbO71w6i4=; b=WA7dIk7HAYrvlInWN8JouTlQj8lfJeMV1j33bcwkT7xK4I7nHuJJBhXgC34ZloKbO6 LAE5/bPZXBg949IW4qLQ3CyeO0S8ccGm8+Imt5p8/hA+QVpOIDfzVQtjpZ/3EoF3/Qyu yeC7BkyeDOdGOsEjoecF7YX++0fTEJlP82FBiqi5FjmfznbUhTNmX07YCzJcUkgDHjRY Orv9Zk14Wni+tzjt4s3AesXZAz6AE7NhqcmZ99rwzoVen4esEqxC7AmA7y9qkcf6U+Yb TYtjFRjGj/dksP0QA0gMQZ85+vAGt4AruyfAubB6Jn2aW0yhAhO0w47xreSaEJlhScAt NsWw== X-Gm-Message-State: AOJu0YzJEE9wPpvshgN2jIMGwkdomBOlOEVwPtOqwtTsBD55WJFqi6GH lPL5AL4hf3jvXRG5OKFLf8CFKGOw1Uc7NCy1X0fhHH/jcpih4lVVPOIOig== X-Google-Smtp-Source: AGHT+IFW397VJKN4V9CveYDRJtKbsnFFFv2tRNEkJkXu8q13sWh8hUcQABCADhrK5pnXqpNitDDVrg== X-Received: by 2002:a05:6402:2554:b0:58b:d7f2:eef3 with SMTP id 4fb4d7f45d1cf-594baf87f63mr11997854a12.12.1720873435188; Sat, 13 Jul 2024 05:23:55 -0700 (PDT) Received: from hthiery.fritz.box (ip5f5ba0e6.dynamic.kabel-deutschland.de. [95.91.160.230]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59b26f621b8sm700586a12.85.2024.07.13.05.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 05:23:54 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, Arnout Vandecappelle Date: Sat, 13 Jul 2024 14:23:30 +0200 Message-Id: <20240713122331.298786-2-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240713122331.298786-1-heiko.thiery@gmail.com> References: <20240713122331.298786-1-heiko.thiery@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720873435; x=1721478235; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JFavsMiFV1HxEd3u7LnnW6uMxYXzUWtmp/sbO71w6i4=; b=WgfCsg3sMqQ0s/k9lUqTOcfphiTjjDOx0KqixcUi+wcCaWCdfvfx46KW4gv4Atox4G QUHJYfU0OcJICBmB3mtDbDGGSyRqStk1GxXpGXv/cmwqJqACPvEUrpFZjRv/XtZ4S+eR eaQczU58OPY9iY/pwMBcUw4ejkmP3+mnQSTNWqW1apt4QQC5zULLS+PFx3+oz1db1SJi cSwv/XAt8OZnNrVzQ5QKlylzT+zTYXMXNqaBD7wGjLIjTOfATFqkVrC5g/nid3xiOsk0 UFZxARIkWXNuHoXC1Iwn0kEyyHXEcGTTekI66c8RQPyqFLKmtlVTwA8pPlLXmCp03+E3 mwig== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=WgfCsg3s Subject: [Buildroot] [PATCH v4 1/4] package/blake3: add new host package X-BeenThere: buildroot@buildroot.org 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: Lance Fredrickson , Samuel Martin , Peter Seiderer , Thomas Petazzoni , Heiko Thiery , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This package is used and required for ccache update. Signed-off-by: Heiko Thiery --- v2: - on change v3: - fix BLAKE3_LICENSE_FILES and corresponding hash values v4: - use github macro to get tagged version instead of refs/tags - remove override of CMAKE_ASM_COMPILER (requires series https://patchwork.ozlabs.org/project/buildroot/list/?series=415079) DEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 package/blake3/blake3.hash create mode 100644 package/blake3/blake3.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1fa425f3ee..0222b37efd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1369,6 +1369,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/ diff --git a/package/blake3/blake3.hash b/package/blake3/blake3.hash new file mode 100644 index 0000000000..2a00d19b02 --- /dev/null +++ b/package/blake3/blake3.hash @@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSE diff --git a/package/blake3/blake3.mk b/package/blake3/blake3.mk new file mode 100644 index 0000000000..5625046db6 --- /dev/null +++ b/package/blake3/blake3.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# blake3 +# +################################################################################ + +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION)) +BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package)) From patchwork Sat Jul 13 12:23:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1960111 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLnhP1vR4z1xqx for ; Sat, 13 Jul 2024 22:24:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9478580EF5; Sat, 13 Jul 2024 12:24:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id nyKc7VlFS6_G; Sat, 13 Jul 2024 12:24:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D554B812C5 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id D554B812C5; Sat, 13 Jul 2024 12:24:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 391381BF5AE for ; Sat, 13 Jul 2024 12:24:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 258FF4093B for ; Sat, 13 Jul 2024 12:24:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id pCuhV1AWWVi8 for ; Sat, 13 Jul 2024 12:24:07 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::134; helo=mail-lf1-x134.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org DB7BE40939 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DB7BE40939 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by smtp4.osuosl.org (Postfix) with ESMTPS id DB7BE40939 for ; Sat, 13 Jul 2024 12:24:06 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-52e94eaf5efso3452790e87.2 for ; Sat, 13 Jul 2024 05:24:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720873444; x=1721478244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vLpnOCjsdyKA85bSEaDW7T6gWVoKXLg01IDlxrbRBq0=; b=HoZI33KLVFrQiMnjG4PuiMmEPN4UFSCAPZczzJhXAnKDXHV0HEGq/3fUBBygLfqGDA 32ov688gZLUanHu/GW7pDYCvGbFEiIftKjRLb9wbqIibWnPolMjVc4x3GfKsvZlRkX4j 7PEY2g0UCQw13DY96m/c+W/rSslhrtblaicS0b2pykKH6mBT8J+UfvqPttv6Gi/T2GJb GgIEqX+9s3nuR3l2ewLGP+zDTn1x4rxMaqIth1cOdY1OgKEsDjm5U8VEIObE7aJ/Z1AC OpKfMhU4an5lfTBJKtQmxBCGfR+vYAXCefdWcbeu0Leyr3VibmDjcGXejsXR2LcKcl78 I7PA== X-Gm-Message-State: AOJu0Yz8u+TDh58sUiZL21jBIpDqhWdKUU5KyPT5sYcmOlyqPn6cuw60 rOqnzAqOQAFxKLYdorRco+jXWlo50F6kiH1FV47y9tpK+hr+2dUvU3FLpg== X-Google-Smtp-Source: AGHT+IFv13kONu1ycGacBzr7oF2pvJ9cfv79G49Hk/0c3R8Ixhz0N97hLwTpubk1uzCZWWaLDUGoFA== X-Received: by 2002:a05:6512:3d21:b0:52c:ddc0:7a03 with SMTP id 2adb3069b0e04-52eb99d1feamr10108511e87.55.1720873443822; Sat, 13 Jul 2024 05:24:03 -0700 (PDT) Received: from hthiery.fritz.box (ip5f5ba0e6.dynamic.kabel-deutschland.de. [95.91.160.230]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59b26f621b8sm700586a12.85.2024.07.13.05.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 05:24:03 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, Arnout Vandecappelle Date: Sat, 13 Jul 2024 14:23:32 +0200 Message-Id: <20240713122331.298786-3-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240713122331.298786-1-heiko.thiery@gmail.com> References: <20240713122331.298786-1-heiko.thiery@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720873444; x=1721478244; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vLpnOCjsdyKA85bSEaDW7T6gWVoKXLg01IDlxrbRBq0=; b=YeDjsDWNxTPzhkdwPsTwTzwWSgpq5ciqhBQMch7QfDEugHGufz9yGlBIwZhjMKNlS/ PkSSGKqfLnVBUOikVyclb1X0cLHklZTspYrkbrXMKa9uBZAHDYpseYSGIdLNzjaZyU3l jWijCmUxP4XDPR8xK2vUamID8j5vfmPR8lksFXowRxL0gsuLvDRi7wA+YnHUobCBfEO+ 9I3J6zWs2V7J7u921bXx+N/tFJfYKABoKh1YuHSoBIvGGqmqx5ymWpxKg4znzjkNHMUS Z3ehE0W6UV2oAjpfNdGGgANUYA3ZBOHHb09Lml0O+5D0lLn0v920EqAI055V/90aorYN napw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YeDjsDWN Subject: [Buildroot] [PATCH v4 2/4] package/xxhash: add host support X-BeenThere: buildroot@buildroot.org 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: Lance Fredrickson , Samuel Martin , Peter Seiderer , Thomas Petazzoni , Heiko Thiery , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The host support is required for ccache. Signed-off-by: Heiko Thiery --- v4: - use standard install target for host variant - fix typo in commit message (ccmake -> ccache) package/xxhash/xxhash.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 7708ba1e19..fde8e464f9 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -41,4 +41,17 @@ define XXHASH_INSTALL_TARGET_CMDS PREFIX=/usr DESTDIR=$(TARGET_DIR) $(XXHASH_INSTALL_TARGETS) endef +# we are a ccache dependency, so we can't use ccache +HOST_XXHASH_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" +HOST_XXHASH_OPTS += DESTDIR=$(HOST_DIR) PREFIX=/usr + +define HOST_XXHASH_BUILD_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) +endef + +define HOST_XXHASH_INSTALL_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) From patchwork Sat Jul 13 12:23:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1960112 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLnhT4vsMz1xqx for ; Sat, 13 Jul 2024 22:24:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E6CE281098; Sat, 13 Jul 2024 12:24:23 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Bwlc5aQwxEJY; Sat, 13 Jul 2024 12:24:22 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BCA2981FBE Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id BCA2981FBE; Sat, 13 Jul 2024 12:24:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C33CD1BF5AE for ; Sat, 13 Jul 2024 12:24:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BD2B44093B for ; Sat, 13 Jul 2024 12:24:18 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id j0boxxRNytRC for ; Sat, 13 Jul 2024 12:24:17 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::52e; helo=mail-ed1-x52e.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 1C8DB40939 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1C8DB40939 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1C8DB40939 for ; Sat, 13 Jul 2024 12:24:17 +0000 (UTC) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-59a47d5c22aso1813763a12.1 for ; Sat, 13 Jul 2024 05:24:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720873454; x=1721478254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uNL4rM2Wv6Qt7/Js/SLDAQk+bNv5mrGhfSkP17HOWDM=; b=D3vJcO6rLxdVsv6SUpoyPEIC/kpK8kQBC68IWod9Dy09x9H8Sh19Vy+CY5MzKAalQw ES/Ow5igXuYLKOgc/susBBXeZSdKf5k37MAT1crK+yovJ/a5/RBMrFvbk0tv8FqSCpFJ p+CJx1GuZA3LJHD8dCiADXE6cmYqO7LcfBje2HoTt1eJIV8fNKgUq6lY3VzZhsajU7IN HeC/jF+BHTEr0lkBgx455y+vKGNvLXQlr1h5WO58D9Wyq+j4MBHrZl0AsAIlvMgdsQN0 ut0EG6pf6GZIdL4PJLNLdsdvPsn3buiplQLh2GdXqL3L3To8Uzlgtd4BZa+dC71pQH8o KntQ== X-Gm-Message-State: AOJu0Yyc3KXGE1PoReYVJtD7Q9q40W7eHXaLF0nFEOKC2TrkL7thnwni xWFG+UyYrY949kuwwwLs3OjTVosK4k/CmxNLb5jdVQ7eiZZWCz74f3lYhg== X-Google-Smtp-Source: AGHT+IHQLRjmSNEHWWl1XgxwBve23YXX0e0CqjmsueQj1kAC5gYtbhMgHU65uc06xID5uowxv6insw== X-Received: by 2002:a05:6402:520d:b0:58e:e2a:1b4b with SMTP id 4fb4d7f45d1cf-594ba98f273mr9690878a12.7.1720873454421; Sat, 13 Jul 2024 05:24:14 -0700 (PDT) Received: from hthiery.fritz.box (ip5f5ba0e6.dynamic.kabel-deutschland.de. [95.91.160.230]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59b26f621b8sm700586a12.85.2024.07.13.05.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 05:24:13 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, Arnout Vandecappelle Date: Sat, 13 Jul 2024 14:23:34 +0200 Message-Id: <20240713122331.298786-4-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240713122331.298786-1-heiko.thiery@gmail.com> References: <20240713122331.298786-1-heiko.thiery@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720873454; x=1721478254; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uNL4rM2Wv6Qt7/Js/SLDAQk+bNv5mrGhfSkP17HOWDM=; b=abum194WC0oehhkSTypyLUbc5gieaFKMD9+hHdclVbnAz2+pCu1F60y8ZUfyQ1O92f VRQVf5QMby04Y00KxTOFFHWVDfJ/XaCfbM0K50qKUp4YzGlQvU4rzzza1Lv7aQNZ0z+/ XW6N21PBD4stdVKPiZgnzRYDGzWRB54AbrJw4xcoR7gadby19SZKcIyIgq7lRXFMB4LX AUSRjyRFcelJv5kQ/+05WpB/dkc64q2yb+xi/25wiaWYupfHYsNQz00M7DzdoT62DblK r+efXRQ2T4tBMIP9ZydWYwUGO9W/WyPgH+oc2fSrazgtiXQasEVxUJJmmDGc36hZ4QDu 9QMg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=abum194W Subject: [Buildroot] [PATCH v4 3/4] package/ccache: bump version to 4.10.1 X-BeenThere: buildroot@buildroot.org 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: Lance Fredrickson , Samuel Martin , Peter Seiderer , Thomas Petazzoni , Heiko Thiery , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" https://ccache.dev/releasenotes.html#_ccache_4_10_1 This version requires use the system dependencies of host-blake3 and host-xxhash. The bundled version is not able to build/download. The ZSTD_FROM_INTERNET and HIREDIS_FROM_INTERNET variables are replaced in the ccache build system with DEP_ZSTD and DEP_HIREDIS in version 4.10. For the sake of completeness, all DEP_ variables were set for external dependencies. The generation of documentation has also been switched off. The LICENSE.adoc was updated regarding the bundled libraries version used like cpp-httplib, BLAKE3, fmt, nonstd-span, cxxurl. Signed-off-by: Heiko Thiery --- v4: - add note for change reason in LICENCE.adoc package/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 27 +++++++++++++++++---------- package/pkg-generic.mk | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index a2537077b6..744e167489 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz +sha256 3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6 ccache-4.10.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc +sha256 de4684f5251a0a2c58f3a7ab94d6a8d3443822cbd01abcdadd9250d3d1e0bfe1 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 0b2c02e8a7..d92608512c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,20 +4,27 @@ # ################################################################################ -CCACHE_VERSION = 4.9.1 +CCACHE_VERSION = 4.10.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt -HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd host-xxhash host-blake3 # We are ccache, so we can't use ccache HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DCCACHE_DEV_MODE=OFF \ - -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF \ + -DDEP_BLAKE3=SYSTEM \ + -DDEP_FMT=BUNDLED \ + -DDEP_CPPHTTPLIB=BUNDLED \ + -DDEP_HIREDIS=SYSTEM \ + -DDEP_NONSTDSPAN=BUNDLED \ + -DDEP_TLEXPECTED=BUNDLED \ + -DDEP_XXHASH=SYSTEM \ + -DDEP_ZSTD=SYSTEM \ + -DENABLE_DOCUMENTATION=OFF \ -DENABLE_TESTING=OFF # Patch host-ccache as follows: @@ -32,12 +39,12 @@ HOST_CCACHE_CONF_OPTS += \ HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp - sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp - sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index e1c16b7343..eeb7531dbb 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -793,7 +793,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd host-xxhash host-blake3,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From patchwork Sat Jul 13 12:23:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1960113 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLnhZ1K2jz1xqx for ; Sat, 13 Jul 2024 22:24:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9A47483EDC; Sat, 13 Jul 2024 12:24:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CjsKWMKuGc-r; Sat, 13 Jul 2024 12:24:27 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 41E1882046 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 41E1882046; Sat, 13 Jul 2024 12:24:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AE4A91BF5AE for ; Sat, 13 Jul 2024 12:24:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A7A4E60626 for ; Sat, 13 Jul 2024 12:24:24 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SyKbuR-F1N8W for ; Sat, 13 Jul 2024 12:24:23 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::52c; helo=mail-ed1-x52c.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 3014D60621 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3014D60621 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3014D60621 for ; Sat, 13 Jul 2024 12:24:23 +0000 (UTC) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-58ef19aa6b3so1778166a12.1 for ; Sat, 13 Jul 2024 05:24:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720873460; x=1721478260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JWErk14YQ5y/XAusLG396th3nxpdmWF5Id5bT3QbwPw=; b=p4rxjzKrQYM6YniA2tBBQX8H5CVlI8AFvoDXQDJlkHtpruT3sb71LsiCXu3K6C5IWG cy6RM6EYy5BDA0c3q3OK1ZOazZntwCcKI4bHAMBT50yXqhM7uDHa15jWKdnajOy/1bjo +qUhRcsdAPM2BaqggE7OWP4DDNtsXeM5NcPP4E0kdVu1DGOtlEPdlP4WJmlMPxDhxVfP X5ap9eUbLQJIGDw7hbJMfv8iVIhVI9wcqyAe/c/dVC4F9K56ShRrGxGt1Ji6qvEBa6BE di2qRgLMFWM4Q5CCzpFYP0QzOcvbYAx/MomSmBQSflmPir5LYVe33wLew6dfyDP4QGMD R5Lg== X-Gm-Message-State: AOJu0YyjPSfBplHw3XF1lkvHgjZc16nkxGih0l7Bmwn66Rv6dawbX3nL lUp2rLi1+LpFmwkQoTXnKYmHsufxj4YwSMfOk0NHq3qidpC/MiCEGVHczA== X-Google-Smtp-Source: AGHT+IHCed7FWZAwda3AiR9Sd/cLdbuRN+zMnY7X5DjOvsngB3L/cZgIzRKNOmBrj3Boq16gyMbo4w== X-Received: by 2002:a05:6402:348c:b0:58f:2087:7983 with SMTP id 4fb4d7f45d1cf-594bcba842bmr12643662a12.40.1720873460246; Sat, 13 Jul 2024 05:24:20 -0700 (PDT) Received: from hthiery.fritz.box (ip5f5ba0e6.dynamic.kabel-deutschland.de. [95.91.160.230]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59b26f621b8sm700586a12.85.2024.07.13.05.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 05:24:19 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, Arnout Vandecappelle Date: Sat, 13 Jul 2024 14:23:36 +0200 Message-Id: <20240713122331.298786-5-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240713122331.298786-1-heiko.thiery@gmail.com> References: <20240713122331.298786-1-heiko.thiery@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720873460; x=1721478260; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JWErk14YQ5y/XAusLG396th3nxpdmWF5Id5bT3QbwPw=; b=TrggIEp5YKW7NBLq6rb54mpjyC8taUKXrU0OifyjlJJkXTFdpyOrzPJ77oV3+YgvVs WDPO3JmvcSH/EQbI+OfFGsU0PLb96iwL/3I4FmKCr+zXTtIKbtfZg5Up5mq0crzsdKjy I2DgcD2MFhOF9gwQ8o6c5I1Gmy6YE7THfqvMFgapZkhdV4qsTp5XJU4gwK+UmxKqG1Tw wWYlWvHwlevbtNAATrKa03b1YdTXa+IYiUTKWNDynVk7gm6xeSi/sibALEC0zR+2VtBl B42mMsMkUIJhRGRVi7yc4ap+wlr+XEynRa2Z2e1V4H5ZYbZkJzaDztSuF9Gjj/mfDKbs sBAw== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=TrggIEp5 Subject: [Buildroot] [PATCH v4 4/4] package/pkg-generic.mk: add variable to skip ccache dependency X-BeenThere: buildroot@buildroot.org 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: Lance Fredrickson , Samuel Martin , Peter Seiderer , Thomas Petazzoni , Heiko Thiery , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" As more and more packages are required to build the host ccache package and therefore they has to be filtered out for ccache dependency the list growed up. By adding the variable _ADD_CCACHE_DEPENDENCY with the default value to 'yes' we can remove that dependency for each package that is needed by ccache by setting the value to 'no'. This can be done in the package makefile instead of tracking the list in the core pkg-generic.mk file. This behavior is similar to the skeleton and toolchain dependency. Signed-off-by: Heiko Thiery --- v4: - new commit package/blake3/blake3.mk | 3 +++ package/ccache/ccache.mk | 4 ++++ package/cmake/cmake.mk | 3 +++ package/fakedate/fakedate.mk | 3 +++ package/hiredis/hiredis.mk | 3 +++ package/lzip/lzip.mk | 3 +++ package/pkg-generic.mk | 13 +++++++------ package/pkgconf/pkgconf.mk | 3 +++ package/skeleton/skeleton.mk | 3 +++ package/tar/tar.mk | 3 +++ package/xxhash/xxhash.mk | 3 +++ package/xz/xz.mk | 3 +++ package/zstd/zstd.mk | 3 +++ 13 files changed, 44 insertions(+), 6 deletions(-) diff --git a/package/blake3/blake3.mk b/package/blake3/blake3.mk index 5625046db6..3b1ccb44cc 100644 --- a/package/blake3/blake3.mk +++ b/package/blake3/blake3.mk @@ -10,6 +10,9 @@ BLAKE3_SUBDIR = c BLAKE3_LICENSE = Apache-2.0, CC0-1.0 BLAKE3_LICENSE_FILES = LICENSE +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_BLAKE3_ADD_CCACHE_DEPENDENCY = NO + # We may be a ccache dependency, so we can't use ccache; reset the # options set by the cmake infra. HOST_BLAKE3_CONF_OPTS += \ diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index d92608512c..f727ca04bd 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -9,6 +9,10 @@ CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSI CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt + +# Do not add a recursive dependency to its own +HOST_CCACHE_ADD_CCACHE_DEPENDENCY = NO + HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd host-xxhash host-blake3 # We are ccache, so we can't use ccache diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index eacecdc0ee..842457eb34 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -14,6 +14,9 @@ CMAKE_CPE_ID_VALID = YES # Tool download MITM attack warning if using npm package to install cmake CMAKE_IGNORE_CVES = CVE-2016-10642 +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_CMAKE_ADD_CCACHE_DEPENDENCY = NO + # CMake is a particular package: # * CMake can be built using the generic infrastructure or the cmake one. # Since Buildroot has no requirement regarding the host system cmake diff --git a/package/fakedate/fakedate.mk b/package/fakedate/fakedate.mk index 99ea748e07..3db9145e63 100644 --- a/package/fakedate/fakedate.mk +++ b/package/fakedate/fakedate.mk @@ -7,6 +7,9 @@ # source included in buildroot HOST_FAKEDATE_LICENSE = GPL-2.0+ +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_FAKEDATE_ADD_CCACHE_DEPENDENCY = NO + define HOST_FAKEDATE_INSTALL_CMDS $(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/bin/date endef diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index 476b079336..86f35bd4cd 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -12,6 +12,9 @@ HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_HIREDIS_ADD_CCACHE_DEPENDENCY = NO + HIREDIS_CONF_OPTS = -DENABLE_NUGET=OFF -DDISABLE_TESTS=ON HOST_HIREDIS_CONF_OPTS = -DENABLE_NUGET=OFF -DDISABLE_TESTS=ON -DENABLE_SSL=OFF diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index 31b5750767..9e09e578db 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -9,6 +9,9 @@ LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_LZIP_ADD_CCACHE_DEPENDENCY = NO + define LZIP_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr \ $(TARGET_CONFIGURE_OPTS) ) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index eeb7531dbb..0dd9f6b26d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -761,6 +761,9 @@ endif # ifeq ($$($(2)_CPE_ID_VALID),YES) # Similarly for the skeleton. $(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES $(2)_ADD_SKELETON_DEPENDENCY ?= YES +ifeq ($$(BR2_CCACHE),y) +$(2)_ADD_CCACHE_DEPENDENCY ?= YES +endif ifeq ($(4),target) @@ -772,6 +775,10 @@ $(2)_DEPENDENCIES += toolchain endif endif +ifeq ($$($(2)_ADD_CCACHE_DEPENDENCY),YES) +$(2)_DEPENDENCIES += host-ccache +endif + ifneq ($(1),host-skeleton) $(2)_DEPENDENCIES += host-skeleton endif @@ -792,12 +799,6 @@ $(2)_EXTRACT_DEPENDENCIES += \ $$(call extractor-pkg-dependency,$$(notdir $$(dl)))) endif -ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd host-xxhash host-blake3,$(1)),) -$(2)_DEPENDENCIES += host-ccache -endif -endif - ifeq ($$(BR2_REPRODUCIBLE),y) ifeq ($$(filter host-skeleton host-fakedate,$(1)),) $(2)_DEPENDENCIES += host-fakedate diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 1d73b691e1..a8c7b48287 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -11,6 +11,9 @@ PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING PKGCONF_CPE_ID_VENDOR = pkgconf +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_PKGCONF_ADD_CCACHE_DEPENDENCY = NO + # We are a ccache dependency, so we can't use ccache HOST_PKGCONF_CONF_ENV = \ CC="$(HOSTCC_NOCCACHE)" \ diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 4eaaf32ead..1bb3971191 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -11,6 +11,9 @@ SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO SKELETON_ADD_SKELETON_DEPENDENCY = NO +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_SKELETON_ADD_CCACHE_DEPENDENCY = NO + # Although the $(HOST_DIR)/usr symlink is mostly for backward compatibility, # there are weird packages that still require it (see host-systemd, and # commit 35c11a027c88). diff --git a/package/tar/tar.mk b/package/tar/tar.mk index a7e85afb72..b9de082603 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -13,6 +13,9 @@ TAR_CPE_ID_VENDOR = gnu TAR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) TAR_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_TAR_ADD_CCACHE_DEPENDENCY = NO + # busybox installs in /bin, so we need tar to install as well in /bin # so that we don't end up with two different tar # diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index fde8e464f9..f16a784966 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -10,6 +10,9 @@ XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_XXHASH_ADD_CCACHE_DEPENDENCY = NO + XXHASH_TARGETS = xxhsum libxxhash.pc XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ diff --git a/package/xz/xz.mk b/package/xz/xz.mk index fa4f6dbda9..e295144ed1 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -13,6 +13,9 @@ XZ_LICENSE = Public Domain, BSD-0-Clause, GPL-2.0+, GPL-3.0+, LGPL-2.1+ XZ_LICENSE_FILES = COPYING COPYING.0BSD COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_XZ_ADD_CCACHE_DEPENDENCY = NO + XZ_CONF_OPTS = \ --enable-encoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ --enable-decoders=lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,arm64,sparc,riscv \ diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index a2da0dd479..575bb2c838 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -12,6 +12,9 @@ ZSTD_LICENSE_FILES = LICENSE COPYING ZSTD_CPE_ID_VENDOR = facebook ZSTD_CPE_ID_PRODUCT = zstandard +# The package is a dependency to ccache so ccache cannot be a dependency +HOST_ZSTD_ADD_CCACHE_DEPENDENCY = NO + ZSTD_OPTS += PREFIX=/usr ZSTD_OPTS += ZSTD_LEGACY_SUPPORT=0 ifeq ($(BR2_PACKAGE_ZLIB),y)