From patchwork Sat May 13 05:10:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 49983 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DFF6D27BBF1; Sat, 13 May 2023 06:11:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2EE8827BBEE for ; Sat, 13 May 2023 06:11:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxhXC-0002bY-NQ; Sat, 13 May 2023 01:11:10 -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 1pxhX4-0002Yy-Kr for guix-patches@gnu.org; Sat, 13 May 2023 01:11: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 1pxhX4-0004uh-CV for guix-patches@gnu.org; Sat, 13 May 2023 01:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxhX4-0004pS-8b for guix-patches@gnu.org; Sat, 13 May 2023 01:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63479] [PATCH] gnu: mesa-opencl: Remove reference to patch Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 05:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63479@debbugs.gnu.org, 63456@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org, 63456@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168395465018541 (code B ref -1); Sat, 13 May 2023 05:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 May 2023 05:10:50 +0000 Received: from localhost ([127.0.0.1]:35203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxhWr-0004oz-GL for submit@debbugs.gnu.org; Sat, 13 May 2023 01:10:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:35500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxhWp-0004on-Fz for submit@debbugs.gnu.org; Sat, 13 May 2023 01:10:47 -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 1pxhWp-0002Wp-9V for guix-patches@gnu.org; Sat, 13 May 2023 01:10:47 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxhWc-0004rR-Pv for guix-patches@gnu.org; Sat, 13 May 2023 01:10:47 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-64ab2a37812so9082408b3a.1 for ; Fri, 12 May 2023 22:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683954632; x=1686546632; 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=h6ntIavBvUpWSEaWC6vvn5lM0XKAwBOYLJjUfPZpECcn722qnEEOp6MDkoxRJ5afA+ pDWJLDyXUHAFIiFcMqNV31SriyCod2CTuIxTjgFl3LfSd7VXFHHFL5ioJ2JuqujQl48D mRRvxfbd20pR7SiQAlYrtqll4ShRH8icgbYEkZcRmDul8p1lHBZCMtgaf3k629Sy+jdl Ii36objeEpTuMV/lZLcIpyy7Q+KvrhWJjWEzApSRpb8kWW84h5wMhfCWqgYYcx57SBF2 C46D51/fvEpvmASBaP4dQfiMJ9RAn8klKEedwiWhvuVjghEDoQ4fk/kNknKYqSjairu4 LUqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683954632; x=1686546632; 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=Z8dhoHW1Q+eO+Yfwj22oIrHEICaoQkKC7srmupVzbg4XU32A+dRivnvfZt5RkftZT5 OQUA0JBS+8hgzaXJjcg7SiPp3nBahh2fYeRTIhBSZ1ZZm8iGpQk93VKrDW9eDu9+xaZJ vKrwOpypjDSgZwIImoBK3Hx1//FUqeJXi/nghRUtOmCbGnjbW60jWcXsWUHIjnU767MB Y08jDHWSYKCe8mmWAhH39jP1/2qxmc4+TYIwmEdygFtHoRQRZGR5p7jGl9oeLFznI4ZL AORT1fAzT2bCmbO4RUa/5tnAqIUeVe9cS065usz5Kvcwzp9EUOQDd+s54u0fTDC7aiwO R9hg== X-Gm-Message-State: AC+VfDy76WfyBk2DKw7gIUDCRk8/M+E2WkiBBn3rODOBEd5f1/9nxPtJ cJcTBnuXLuIGpf2gEVZ8kifE53FPaYg= X-Google-Smtp-Source: ACHHUZ6BU5ux7q7PArZjrqLzT610nEgi/Gx14OSQTEQg8AuU9xV+ENcFYGRdqTx3UGu91lbSFqLuIA== X-Received: by 2002:a17:90a:744c:b0:246:9c75:351a with SMTP id o12-20020a17090a744c00b002469c75351amr30896373pjk.12.1683954632372; Fri, 12 May 2023 22:10:32 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id m2-20020a17090a858200b0024e026444b6sm19888130pjn.2.2023.05.12.22.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 22:10:32 -0700 (PDT) From: Andy Tai Date: Fri, 12 May 2023 22:10:28 -0700 Message-Id: <8a5f461a5c43d0013b6ed876caa11b66a1e283c0.1683874169.git.atai@atai.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=lichengtai@gmail.com; helo=mail-pf1-x42d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 base-commit: d6f6b57766e95d2fa8af63d4460a2b303ca4d867 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']