From patchwork Thu Jul 4 12:34:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1956841 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::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4WFGMQ63ywz1xqb for ; Thu, 4 Jul 2024 22:35:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 161C2409A5; Thu, 4 Jul 2024 12:35:29 +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 FFEQ6D94wuID; Thu, 4 Jul 2024 12:35:26 +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 smtp4.osuosl.org 9894D40D57 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9894D40D57; Thu, 4 Jul 2024 12:35:25 +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 A0DA41BF321 for ; Thu, 4 Jul 2024 12:35:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 9BC7160816 for ; Thu, 4 Jul 2024 12:35:23 +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 pHrlK10V2Pph for ; Thu, 4 Jul 2024 12:35:23 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::633; helo=mail-ej1-x633.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org C1EF3607E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C1EF3607E9 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by smtp3.osuosl.org (Postfix) with ESMTPS id C1EF3607E9 for ; Thu, 4 Jul 2024 12:35:22 +0000 (UTC) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a77c4309fc8so13254066b.3 for ; Thu, 04 Jul 2024 05:35:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720096520; x=1720701320; 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=yKVsC5Ev7NfrnZ+kVGp/oE/H1SuDpKD7MX/XSdV6cSE=; b=IOWoRraoBYur0sUtmY6ngJxNhjhaBhx1rb3O58BDTfVKPgff89ZRgG17fCox3pliFb blrvzofWpTM97pq2q0jotgV2MFDzDZeyQ71i3qrwRR4+qGdKFIdrwIktYSXk9nSx69Zg wucTQq0nfAcEZxZt3HM2i12W5b0egMQzmQ7EdDWnLLyYUXJTm7rA57ZAPZ1549g2fynk fkuCXE56dgZFUyQBLeD5F7OBQLZnIJjpEnteuaN01zUmG7HpVfPZM/ae6+vTwRJlS6t+ gmA3KCxmZvsmI+v+T5IUIVDvrJZrVgYyWPf16BCT757i7Y7ruHNkf7YhwZic0HcuJBIt dWSw== X-Gm-Message-State: AOJu0Ywz7fTdG7la9ZlPWQVBxKkR5Lt4aa7xF6fyTLA1lgn/yRY1hxiX jSZnU59zMDzLMyjYU8+31COSGvfAL0hq2WaiCbWerYxZ4TmOFAhtqjCvKw== X-Google-Smtp-Source: AGHT+IH18jjPiC0ki7eyd361BL2iUKDPnGjQoITtdgDyWfetsMBo8yi2DuxWZj5CuEJty1K/z6fd5g== X-Received: by 2002:a17:906:adca:b0:a72:7bf4:694c with SMTP id a640c23a62f3a-a77ba4517e5mr103874066b.16.1720096520035; Thu, 04 Jul 2024 05:35:20 -0700 (PDT) Received: from hthiery.kontron.local ([2a02:810b:5a40:2a43:7200:ad55:a3ad:7bab]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77bd30d04asm40845366b.143.2024.07.04.05.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 05:35:19 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, "Yann E . MORIN" , Arnout Vandecappelle , Peter Seiderer , Lance Fredrickson Date: Thu, 4 Jul 2024 14:34:52 +0200 Message-Id: <20240704123452.3535612-2-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240704123452.3535612-1-heiko.thiery@gmail.com> References: <20240704123452.3535612-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=1720096520; x=1720701320; 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=yKVsC5Ev7NfrnZ+kVGp/oE/H1SuDpKD7MX/XSdV6cSE=; b=gies3gSK0AhqPXag8W1OnxC+4GGLiatzlMpohRo7NZ/nbpf5Kxq7nX15/091Thj/TV JBkX7CO9uWECPiqfybDfQbNLzzzhGccMxdaiMkIudwi5r/tQZF1sDfDYf7dMFWxsSAWy w/eW+IhXKCXq8kJ2efBSJXhUStXN/wuOGLx8gyVGNOwqsajACDKl7UVmdle/Gauq/o0l 0gvkqE6Gq5s5zCCU1jIfdOULRTVUmFKdEgo5TW/76F3T2YLEDMkws9FF4iy5qRteN8kT 2Lfc5rYpAceFtA1iL39FcWsEMwTg93Hw5sK9EhQn1OIsZpKdlF/cZATYLwWJ/p7byIJt 8b8Q== 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=gies3gSK Subject: [Buildroot] [PATCH v3 1/3] 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: Heiko Thiery , Samuel Martin , Thomas Petazzoni 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 DEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 package/blake3/blake3.hash create mode 100644 package/blake3/blake3.mk diff --git a/DEVELOPERS b/DEVELOPERS index 90d1a111ab..46fe3cd2e1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1359,6 +1359,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..76e4e32e7a --- /dev/null +++ b/package/blake3/blake3.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################ + +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(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 += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package)) From patchwork Thu Jul 4 12:34:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1956842 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=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4WFGMY2cGfz1xqb for ; Thu, 4 Jul 2024 22:35:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7189B40D67; Thu, 4 Jul 2024 12:35:35 +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 nvjIap2gt9c5; Thu, 4 Jul 2024 12:35:33 +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 smtp4.osuosl.org 40F5F410B2 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 40F5F410B2; Thu, 4 Jul 2024 12:35:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0ADD71BF321 for ; Thu, 4 Jul 2024 12:35:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id ED3A084718 for ; Thu, 4 Jul 2024 12:35: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 C-oHZO4Et4eg for ; Thu, 4 Jul 2024 12:35:28 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::52f; helo=mail-ed1-x52f.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 2183A84717 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2183A84717 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2183A84717 for ; Thu, 4 Jul 2024 12:35:28 +0000 (UTC) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-57cc1c00ba6so863740a12.1 for ; Thu, 04 Jul 2024 05:35:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720096526; x=1720701326; 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=I6MN2esA9NbdqU4frW8o3SWLRtQmaGvggPALWNWEW7I=; b=bbhN7iFBZH6dRxodrUbUdbb90wE+fn5H1Gk2jEPpzWmnzYoK28V7iZxTuehF/OD+28 +sGerrzQ30hFdSyRKui+j/JR2cHnB7yDV8+m4tklhPzWgE1SD08aspWfgF7pSs4bOVZK x7rwdpEZD7apGqipAeVbJB0Z9H0TFtGIzzOh4Y9keHxZIhhX2IVxeHI/J+L+54bwfqnj VUA2nBDNxOyBWNGmEZJDIUgAno6FfrUlAeHxSOghCUyKnyOnJStSatqOfLOPvkcNINYV hMcMiJDuuGGPIL1PGyZxxdCuwaXEWYUJsJHqigLQzHHCFHsdAoeQetE6Jpy+4iuvzQOj LeFA== X-Gm-Message-State: AOJu0YzFUocLDvxK0oa7HhtnDqPmS76OvAbQfew5OE293pFWZZM8Z+Ie l+LlKWeEZxEcgR0SFF5xiVI/u6RYiDf71cVBvvjoyD8d8Cp1IuPfu6ORGg== X-Google-Smtp-Source: AGHT+IFL2qd3Z2fpGl6s59GrN1kduaaPr9g/b1AfDcz5hvsl3n58+A/k523MMyPZOHACH4AQ1EcBvg== X-Received: by 2002:a17:906:175b:b0:a77:a630:cf89 with SMTP id a640c23a62f3a-a77b9dee79dmr95755366b.0.1720096525542; Thu, 04 Jul 2024 05:35:25 -0700 (PDT) Received: from hthiery.kontron.local ([2a02:810b:5a40:2a43:7200:ad55:a3ad:7bab]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77bd30d04asm40845366b.143.2024.07.04.05.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 05:35:25 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, "Yann E . MORIN" , Arnout Vandecappelle , Peter Seiderer , Lance Fredrickson Date: Thu, 4 Jul 2024 14:34:54 +0200 Message-Id: <20240704123452.3535612-3-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240704123452.3535612-1-heiko.thiery@gmail.com> References: <20240704123452.3535612-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=1720096526; x=1720701326; 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=I6MN2esA9NbdqU4frW8o3SWLRtQmaGvggPALWNWEW7I=; b=ccGdXXjDO7VQpFsEhCEei7bXt0ED/RpLsONan0aXDs3xNJf9ds04NHZMub9MD/4YWy Qs/Mbz+nBrPUxkQmkGbGybgMqMNiI260h0XVLvY3oXwZwM8Y3Dl3cuClo5kIPVuA6YrJ UEltODApHhvaKqxHZCyy3+aFqlHufnM/XvUYAj0gw9WWQG3QQU4NyTk3wSOeNzXQlWow QCNuocpIj/KblIGCG2mdMGcYR3WQKrMd5LfK8PejXeAojYv8ZsfaBZGKssG64iKenQXu TD4grhbybQnBpNS8Vcz3lXj7gH79KQnPFheAB3z0LyOZZ8JBLmC1zXkwjXOxGMqhEqRo FqEQ== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ccGdXXjD Subject: [Buildroot] [PATCH v3 2/3] 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: Heiko Thiery , Samuel Martin , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The host support is required for ccmake Signed-off-by: Heiko Thiery --- package/xxhash/xxhash.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index 7708ba1e19..97bb2ca722 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -15,6 +15,10 @@ XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ install_libxxhash.pc \ install_xxhsum +HOST_XXHASH_INSTALL_TARGETS = \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a @@ -41,4 +45,18 @@ 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) \ + $(HOST_XXHASH_INSTALL_TARGETS) +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) From patchwork Thu Jul 4 12:34:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1956843 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::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4WFGMf0sp2z1xqb for ; Thu, 4 Jul 2024 22:35:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 83ADB410C5; Thu, 4 Jul 2024 12:35:40 +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 V5y1-Z3ST809; Thu, 4 Jul 2024 12:35:39 +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 smtp4.osuosl.org 0B237412F3 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 0B237412F3; Thu, 4 Jul 2024 12:35:39 +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 6534D1BF321 for ; Thu, 4 Jul 2024 12:35:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 56414412FD for ; Thu, 4 Jul 2024 12:35:37 +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 bnKIli6jnkj9 for ; Thu, 4 Jul 2024 12:35:35 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::631; helo=mail-ej1-x631.google.com; envelope-from=heiko.thiery@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org B664840BD3 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B664840BD3 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by smtp4.osuosl.org (Postfix) with ESMTPS id B664840BD3 for ; Thu, 4 Jul 2024 12:35:33 +0000 (UTC) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a724b3a32d2so62873566b.2 for ; Thu, 04 Jul 2024 05:35:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720096530; x=1720701330; 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=neTkaL6m/y/WIpOgY9/Iso5oEzV5IMHfbzFybyq8rsw=; b=G3YFuA9gi12mp+6c7zfw3D60JUITIYGWQbJnFXCClT2KfVrbYF/k/lDln+lWZPECOq vlutQ6df7O8/A9zurUZ1e0rM5lm94xHCPferv5HNdyKbY2ZvKuXMvr299PkWoiDQp0c7 6u5nXour2T0ON7mmbuEG5X1Zggt0j4kPv7MfVmh8aaUpTKlD4FwR8mK+L2YEJ0TkkpAG sNesiSDDIySLFG963Dsjyd5f02RYFF0d6+e34OqXDzhEr2c82Bq+ckzUjvXXmZSWnUfL HLqs1VMIzalhJaE7H01VMEunjm3yObUS0i5T1OoJ2YvPcnqmtJxEwnLEqJIW9xasvRA8 bsdw== X-Gm-Message-State: AOJu0Ywa859nAVYoikg1s+oPP5tsLiLao1AvfwG1E/dLP0A0jxKuqLmD 2nOKUhEBr0FzQA55coedD12A0aXbrVdQ14bIMqr7jYjWyR+RUhgO1AWb+g== X-Google-Smtp-Source: AGHT+IG3ouYQMerwZJHEuJTqzMAVbaSVOq8yzt5XiNj9FB0eGXTCrQunprz+G+DPxm7+LRal5H8akw== X-Received: by 2002:a17:907:6e8d:b0:a77:b788:d760 with SMTP id a640c23a62f3a-a77ba72c299mr119889366b.76.1720096530441; Thu, 04 Jul 2024 05:35:30 -0700 (PDT) Received: from hthiery.kontron.local ([2a02:810b:5a40:2a43:7200:ad55:a3ad:7bab]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77bd30d04asm40845366b.143.2024.07.04.05.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 05:35:29 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org, "Yann E . MORIN" , Arnout Vandecappelle , Peter Seiderer , Lance Fredrickson Date: Thu, 4 Jul 2024 14:34:56 +0200 Message-Id: <20240704123452.3535612-4-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240704123452.3535612-1-heiko.thiery@gmail.com> References: <20240704123452.3535612-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=1720096530; x=1720701330; 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=neTkaL6m/y/WIpOgY9/Iso5oEzV5IMHfbzFybyq8rsw=; b=cPORWtieTWifJeAgc7bteVbaqWRNBqMn/nRx8CVDppHYv0Ojc9AY2dbBzia0Zp5uXS yyh5cVblQ95DfO4gxkbZmfVEoa2+tAqlto9zz/hJsNh6kFc0wj4bGZz68wanE0/p0Ljk 5sooUa/0z7IdJVtXJ6sn9JaIREJjLlatZS8UTz7BEnFIs62TsSVy6k6YRyyIeWPZ8f+0 5z1ngL4VXF4CEBOVnGdHsQpaabEbAWneIJNCSxGDZhoKx3IZ13Yj2Ff5d1fsoq5KXwW9 BAFyvWMpr4mjMzVXJhvLuisKjCVI9my6bkOo/HMtkwlV0DUmeFnOi9I7fsQUveHSKEwq zfDQ== 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=cPORWtie Subject: [Buildroot] [PATCH v3 3/3] 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: Heiko Thiery , Samuel Martin , Thomas Petazzoni 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. Signed-off-by: Heiko Thiery --- v2: - cleanup HOST_CCACHE_CONF_OPTS v3: - adopt LICENSE.adoc hash 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 a2749320c3..7249a9a233 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