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 ms9.migadu.com with LMTPS id IFLtCbcbX2TwWQEASxT56A (envelope-from ) for ; Sat, 13 May 2023 07:10:15 +0200 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 cMEBCbcbX2TyKQEAG6o9tA (envelope-from ) for ; Sat, 13 May 2023 07:10:15 +0200 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 98EAF164E2 for ; Sat, 13 May 2023 07:10:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxhW8-0002QG-Ua; Sat, 13 May 2023 01:10:04 -0400 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 1pxhW6-0002Pp-TQ for bug-guix@gnu.org; Sat, 13 May 2023 01:10:02 -0400 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 1pxhW6-0004cG-L0 for bug-guix@gnu.org; Sat, 13 May 2023 01:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxhW6-0004nH-6G for bug-guix@gnu.org; Sat, 13 May 2023 01:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63456: [PATCH] gnu: mesa-opencl: Remove reference to patch References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 13 May 2023 05:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63456 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: guix-patches@debbugs.gnu.org, 63456@debbugs.gnu.org Cc: Andy Tai Received: via spool by 63456-submit@debbugs.gnu.org id=B63456.168395457218377 (code B ref 63456); Sat, 13 May 2023 05:10:02 +0000 Received: (at 63456) by debbugs.gnu.org; 13 May 2023 05:09:32 +0000 Received: from localhost ([127.0.0.1]:35190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxhVc-0004mK-52 for submit@debbugs.gnu.org; Sat, 13 May 2023 01:09:32 -0400 Received: from mail-pf1-f178.google.com ([209.85.210.178]:62711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxhVZ-0004m3-8c for 63456@debbugs.gnu.org; Sat, 13 May 2023 01:09:30 -0400 Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-64a9335a8e7so9922529b3a.0; Fri, 12 May 2023 22:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683954562; x=1686546562; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=B1HO5DPGrjxIETApcy7iZVeCdT9bxG/vybktPcy9WMY=; b=qg2wj8WxKbmX/Kprp7oDGDxk3XaahmeUHS7erKTHNmbOuRdwTKZjz4YN1xG6OzF9KM sVXHVz3LoD/DALxFgaQktCUexWMCjN6aRgBjeX6gvKatqcshDdDlGhCIIyB5pDuMtbaE +0o2Uil5GOkdVMZsRLyHp5uWJXLe8mEgP6mJv7vee7O4V5WbhZEVyv1uw0WPeIAM2mxy wiOiVEi0X2XbVsGVREg642HbRNGtXPxpD5lA9YaD4HSq0bmas3MG1SA3v9pLJ+Hcowt9 6vXru+IfqLIFq5nDMdWFPOqt5uC+1QnJ9BVa9NL5t8tKBs7KHDrV7GuoqUWuwFeLG/4T nafA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683954562; x=1686546562; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=B1HO5DPGrjxIETApcy7iZVeCdT9bxG/vybktPcy9WMY=; b=FscqXabal6l30StRoCsTJa02MEGaooHq+6JJ8vg0xfmO/0AXZh8lIjuni7X4Ghltaj JEhId2IrgkR+ZvZeWOR5HaLh0tRGaeL/YXE1v1nzOD+nVqWh9VUa5Adc6+Q60MpA6aSm jEfj8EFASVBZNFcvd8IzRLMLd/+h+rSwQR6sN8M/sr6Gj8+gKWNo5KbCi3Q3beFi8V1K ZMca1AbMUCn7SnDkz0YKR/FvohqVKrzn6lsudafkuAV+JcU3cfw0dPFZRdsXW7rahDff KxN2Gx624J9lAMmiLsWdpFFsTYI1hbgZh+rJX3xQdvDN0l/dQzlVGkbAg/okGeSgfGE2 obrw== X-Gm-Message-State: AC+VfDwz5hkK+GqgD9PY6eug0zJRnQM7hCAm1JGtPxY9a5K+8n8lJ9HN 92zUk+s+VivGoQ1FoFGJSE0XkDMUcIc= X-Google-Smtp-Source: ACHHUZ5KyydAKOJQbFV6mK4yCsSByMuRUuwx52A69lHi/3SN+DxCUa5DU1i7L3a9bcHAbC6diJpmNg== X-Received: by 2002:a05:6a20:8405:b0:ff:8640:4c2e with SMTP id c5-20020a056a20840500b000ff86404c2emr25879056pzd.17.1683954561661; Fri, 12 May 2023 22:09:21 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id t17-20020a639551000000b00519c3475f21sm7649863pgn.46.2023.05.12.22.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 22:09:21 -0700 (PDT) From: Andy Tai Date: Fri, 12 May 2023 22:09:16 -0700 Message-ID: <8a5f461a5c43d0013b6ed876caa11b66a1e283c0.1683874169.git.atai@atai.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683954614; a=rsa-sha256; cv=none; b=OnhsxvutkqVYROyrkkGq5uBW0PxM9ygEWUl2pb8hrc1CV0Uo6rOAW7O4lhti32PaYFFe98 34fQnNHIvP5MVB1RTjo88c7n5Gwg/J5ZQJVSbdaXAv1G2aj97l9/2jqg4ua/H3Yvb1Gc5n RnPMV8CYpgvk95QRSiPJ95Bz/K9MbiaH0b61hu0Lef7ZohSXeY6F8kB5/mjaupx3WbQCm5 dRb667qbJTNgu4ONqZUpTtzfFq/YBrigVi3x2tWt6ZpA54itgThXkQt+cg1JweDxM6D+DQ VSzRnYpj2uUvla4Ct8omRdoQQmGBmYivJw4o4an5NyfzE0kqEozzpGr44LAUOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qg2wj8Wx; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683954614; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=B1HO5DPGrjxIETApcy7iZVeCdT9bxG/vybktPcy9WMY=; b=h6PI8XD8zlXwEwnVdMYzI4cCc1qVJEAMEeIqlObPR2ErGB282y7Jl+bLvjxOCap0wQ5Qe6 VyVfyBqjasSBQZNvaj3dO+oitPKjk7xV/6qrkWoNhyZ/P0WJ4wnmE+i156qmxcFtOftlGS hPmS5iWoxvdjBe1K63tIq+vOMy93+UZ/WzRKxa7cK79wf04RgBAZANcVl5LcBkpLctoNIq sREvalqE+0wBB4l1Mqd9y+cJkhMq2Dq18K9nanW3Y+wG+oxvkzdK5KxCLujvj23uanGw3M +aqP+9Bs0JZ7vGPLI6vi6R4xw6wjqKMVgUgfmVDYfrXlAUDlSPRHcIdEVo95fQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=qg2wj8Wx; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.32 X-Spam-Score: 2.32 X-Migadu-Queue-Id: 98EAF164E2 X-TUID: Vg4Zg33SShmU Message-ID: <20230513050916.FcmxryBrVAwH8Acb1oy7WRp-c_mkk2DRq9O56xv-JTw@z> Fixes . * gnu/packages/patches/mesa-opencl-all-targets.patch: Removed * gnu/local.mk: Remove reference to mesa-opencl-all-targets.patch * gnu/packages/gl.scm (mesa-opencl)[source]::Remove patch application of mesa-opencl-all-targets.patch --- gnu/local.mk | 1 - gnu/packages/gl.scm | 4 +-- .../patches/mesa-opencl-all-targets.patch | 25 ------------------- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/mesa-opencl-all-targets.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73db48f720..73180be88a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1561,7 +1561,6 @@ dist_patch_DATA = \ %D%/packages/patches/memtest86+-build-reproducibly.patch \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mercurial-openssl-compat.patch \ - %D%/packages/patches/mesa-opencl-all-targets.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 235b386dad..030c828e5b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -530,9 +530,7 @@ (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") (source (origin - (inherit (package-source mesa)) - (patches (cons (search-patch "mesa-opencl-all-targets.patch") - (origin-patches (package-source mesa)))))) + (inherit (package-source mesa)))) (arguments (substitute-keyword-arguments (package-arguments mesa) ((#:configure-flags flags) diff --git a/gnu/packages/patches/mesa-opencl-all-targets.patch b/gnu/packages/patches/mesa-opencl-all-targets.patch deleted file mode 100644 index 99d4abcea4..0000000000 --- a/gnu/packages/patches/mesa-opencl-all-targets.patch +++ /dev/null @@ -1,25 +0,0 @@ -This patch restores LLVM targets needed for OpenCL, *reverting* this -upstream commit: - - From 80817b6e344258ac9b955f824ebf9019a0fc1610 Mon Sep 17 00:00:00 2001 - From: Jesse Natalie - Date: Wed, 18 Nov 2020 18:30:30 -0800 - Subject: [PATCH] meson: Adjust Clover's required LLVM modules - -diff --git a/meson.build b/meson.build -index 6d1607c35a3..f828eb80faa 100644 ---- b/meson.build -+++ a/meson.build -@@ -1479,10 +1479,9 @@ - endif - if with_gallium_opencl - llvm_modules += [ -- 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', -- 'lto', 'option', 'objcarcopts', 'profiledata' -+ 'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader', -+ 'lto', 'option', 'objcarcopts', 'profiledata', - ] -- llvm_optional_modules += ['frontendopenmp'] - endif - if with_microsoft_clc - llvm_modules += ['target', 'linker', 'irreader', 'option', 'libdriver'] base-commit: d6f6b57766e95d2fa8af63d4460a2b303ca4d867 -- 2.39.2