From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id uO/8I3dMyWPrMQEAbAwnHQ (envelope-from ) for ; Thu, 19 Jan 2023 14:58:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id CHwhI3dMyWMCdgEAG6o9tA (envelope-from ) for ; Thu, 19 Jan 2023 14:58:15 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5CA252F77F for ; Thu, 19 Jan 2023 14:58:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pIVPc-0000Gi-US; Thu, 19 Jan 2023 08:57:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pIVPb-0000Dh-K3 for guix-patches@gnu.org; Thu, 19 Jan 2023 08:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pIVPb-0006C3-C8 for guix-patches@gnu.org; Thu, 19 Jan 2023 08:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pIVPb-0002tZ-88 for guix-patches@gnu.org; Thu, 19 Jan 2023 08:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60934] [PATCH v2 2/2] HELPER PATCH Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Jan 2023 13:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60934 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60934@debbugs.gnu.org Cc: John Kehayias , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Efraim Flashner Received: via spool by 60934-submit@debbugs.gnu.org id=B60934.167413659011064 (code B ref 60934); Thu, 19 Jan 2023 13:57:03 +0000 Received: (at 60934) by debbugs.gnu.org; 19 Jan 2023 13:56:30 +0000 Received: from localhost ([127.0.0.1]:42912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIVP3-0002sJ-NN for submit@debbugs.gnu.org; Thu, 19 Jan 2023 08:56:30 -0500 Received: from mail-ej1-f47.google.com ([209.85.218.47]:41474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pIVOx-0002rd-60 for 60934@debbugs.gnu.org; Thu, 19 Jan 2023 08:56:23 -0500 Received: by mail-ej1-f47.google.com with SMTP id u19so5821317ejm.8 for <60934@debbugs.gnu.org>; Thu, 19 Jan 2023 05:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=nlS8DiB6F/gkMe2PQCHABVQBS7F6QLiGY9EcXHQuYJI=; b=l1LPXqXJleP4WZR9ojxP6A5BohnhVEO8mbItL2LBDSbVivYD13r+gIwD6LIE4DPVie T90JILvOuCKCqRs6hLLXJkdqj+KftyWW8ba3SpVu5a8TzAMNMozilkqJqavTzyjLL5jH MHUAQeBpdNQNZrLdnu8T+P7i2dnSVf6VFkBDChnMjkmk8a4t4ziHNR2lLUwyavxI+3+h 8xDwcQeuFiDX/ccCCCkjcCjUzkeqncn90cpEbeCKd5qgCYN6s06Pn/vhrK4XsEO0OnvQ CPSSwBMvuEimWa+4V1jU6OTOXzf/3pOjBPh5CBoFsgwHU0o8PoiUduOJ2FO5l2jOLroh pHmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nlS8DiB6F/gkMe2PQCHABVQBS7F6QLiGY9EcXHQuYJI=; b=PAyciP+yANRlXAaURPHCD6x+9Na9/U/JeWN6l/caOb4APvuEPgTA+QyFBrTFKQVoti flhk6J0JFAaE/aHpc/keliPjEvPj7YncZlhxA/Cld6fsPLQQXyXIJ5d8jOx3aHREOUD6 OlmciYHKgOILj85tuNY+8bLoaZihUYcosBjBVWkTpshjPNI9jj7770rveC+CGZuOp0uV fDoFjOSKs/tfbPh1H5IW6aa2wqlRfxbNbFuijRwUVSybRYfkBGGqOLbAIaKiFnD3yvpA 7xOlIln9wfljDnbkFGJX2tSBffMwhEbqI4aOICS0chwb53emZj+5HcO98t1fOd7jfQzH vChQ== X-Gm-Message-State: AFqh2kpJOcMB55KPN0/qRWxwb7y6pr0MpsqQ3wn/V6sPR+5DU2mhB5hE /czmkfhKCEPpZzzc6nOsRsXeijXgjCQzYg== X-Google-Smtp-Source: AMrXdXvv408P5vwHVcdOaN2Pjsq4LwRy54LZ7Oidpy4V74UpPqSlXuvitpSPMrFJ0hBwfypsvuA2JA== X-Received: by 2002:a17:906:644f:b0:877:6549:bb6 with SMTP id l15-20020a170906644f00b0087765490bb6mr5209799ejn.58.1674136577492; Thu, 19 Jan 2023 05:56:17 -0800 (PST) Received: from localhost ([2a02:ed3:910:1100:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id lb25-20020a170907785900b007c00323cc23sm16285172ejc.27.2023.01.19.05.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jan 2023 05:56:17 -0800 (PST) From: Efraim Flashner Date: Thu, 19 Jan 2023 15:56:04 +0200 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674136695; a=rsa-sha256; cv=none; b=oVhG3sQi1ieK+VLmRvudfcJIivyrRAdG9FCugUIhpFBqeXqHYqqNytHHB/QsBvW8B99sRg TOO6Wg+OJPeLFnJfS+tG3Pa6sZ5SAju6V3bFHBm8hCs41UhYY3vCB9+pt2iImA9rrmDKM3 idj+etrKWCQqnGjqX/vK0YrwtJvlMnMU2TdA/UvTurz9vta5hG7smqrZdngoqc45bgoQ+t FgOwcuWOPgSHBWpZoYdb/evfbeoZDxIe8nP700w3GncOX27QlRHI/BW8JjL3Qhmw4RtY2r H9T3pMFpj+ZQuXBTH0W2jCFm/sEeA2my/mwwYbDGdVOahKSxvnVoaZYSWc77ZA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=l1LPXqXJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674136695; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nlS8DiB6F/gkMe2PQCHABVQBS7F6QLiGY9EcXHQuYJI=; b=K01/x25HBBe72aNh68/XobP/5pfT9Lr1OozvHZMx7vDnAxnqXSO/Ci5CvR1GcPg6i4mfd2 O6pS8IOZjfd9zq4FSvl69sFXWqnAXe4bNHsjXjpFY4yet0XbhV1YQ2G48uI9uYraahBwkJ hzgG0r0PZPzOViAdZ+c2YD0Mr6FQtnjSIr1GyThseaIbGhXsGsaoMgJYvj3qjxAY23M9M7 eq0cnHAkxk0y/x8FTcz+zB9o3/CghQlVwzEHwOPbr8P9VPHQ28rKvKJgxW2+y9InAJwoZ6 uD+EoolFmW2UZr0SaZPlePzpPQFHURMD0YJL+9QxXysCTupQYHoL4RL2NkMEnA== X-Spam-Score: 1.27 X-Migadu-Queue-Id: 5CA252F77F Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=l1LPXqXJ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: 1.27 X-TUID: T8pWZPRdbM7T This patch is to allow testing llvm-for-mesa while allowing the actual patch to be cleanly shown. * gnu/packages/gl.scm (mesa)[inputs]: Replace llvm-11 with llvm-for-mesa. * gnu/packages/llvm.scm (llvm-for-mesa): Inherit from llvm-14. [arguments]: Inherit package arguments from llvm-15. --- gnu/packages/gl.scm | 2 +- gnu/packages/llvm.scm | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01ab6135a4..084c14dd2f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -304,7 +304,7 @@ (define-public mesa wayland-protocols) ;; TODO: Resort alphabetically. ;; Note: update the 'clang' input of mesa-opencl when bumping this. - (list llvm-11))) + (list llvm-for-mesa))) (native-inputs (append (list bison flex diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 8379b23fa5..23332dd8e2 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -2072,11 +2072,15 @@ (define-public emacs-clang-rename (define-public llvm-for-mesa ;; Note: update the 'clang' input of mesa-opencl when bumping this. - (let ((base-llvm llvm-15)) + ;; llvm-15 is missing include/llvm-c/Transforms/Coroutines.h, needed by mesa-21.3. + ;; Therefore we inherit from llvm-14 but use the package arguments from llvm-15. + ;; This is an unsupported configuration of configure-flags for cross-building but + ;; works for mesa. + (let ((base-llvm llvm-14)) (package (inherit base-llvm) (arguments - (substitute-keyword-arguments (package-arguments base-llvm) + (substitute-keyword-arguments (package-arguments llvm-15) ((#:modules modules '((guix build cmake-build-system) (guix build utils))) `((ice-9 regex) -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted