From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IF9FNsSRBWE4OgEAgWs5BA (envelope-from ) for ; Sat, 31 Jul 2021 20:09:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yKYOMsSRBWFhTgAA1q6Kng (envelope-from ) for ; Sat, 31 Jul 2021 18:09:08 +0000 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 28BCE2D0D3 for ; Sat, 31 Jul 2021 20:09:08 +0200 (CEST) Received: from localhost ([::1]:60050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9tQ2-0005LE-RE for larch@yhetil.org; Sat, 31 Jul 2021 14:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9tPy-0005Kx-9O for guix-patches@gnu.org; Sat, 31 Jul 2021 14:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9tPy-0003RU-1d for guix-patches@gnu.org; Sat, 31 Jul 2021 14:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9tPx-0003I9-Pt for guix-patches@gnu.org; Sat, 31 Jul 2021 14:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49794] [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Jul 2021 18:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49794@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.162775492312627 (code B ref -1); Sat, 31 Jul 2021 18:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2021 18:08:43 +0000 Received: from localhost ([127.0.0.1]:34814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9tPe-0003Hb-Sg for submit@debbugs.gnu.org; Sat, 31 Jul 2021 14:08:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:47490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9tPc-0003HT-SZ for submit@debbugs.gnu.org; Sat, 31 Jul 2021 14:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9tPb-0005F4-GD for guix-patches@gnu.org; Sat, 31 Jul 2021 14:08:40 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:59683) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9tPY-00039X-Sm for guix-patches@gnu.org; Sat, 31 Jul 2021 14:08:39 -0400 Date: Sat, 31 Jul 2021 18:08:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1627754910; bh=DVBTO94y0QS5z23v9EFs8f+PSIh0ggh1ykk/Vu4MVvI=; h=Date:To:From:Reply-To:Subject:From; b=CQfbPm+qnCWFk0IvjSha0wqDVcwJVza6+miQNLInYqk2hR9XpOh0TI1JuE0xWc0Sj za9GJxWNxhX05/PohyjykIG0zpu69aB5uyIQFn5RuQCFODANusnb2eCHBPHlvnNrGe wjGaSLQEdL1yrXaIkrLD5/joQSTqhLbFJd8UKQcE= Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_kCf0xPQm51ChUGEx9VCM75Xu5LRFEQDZKWBNNWMBCW8" Received-SPF: pass client-ip=51.77.79.158; envelope-from=john.kehayias@protonmail.com; helo=mail-0201.mail-europe.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches From: John Kehayias via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627754948; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=DVBTO94y0QS5z23v9EFs8f+PSIh0ggh1ykk/Vu4MVvI=; b=GqUWf9Q9mMJ1xJXRc/nAfxcVwYrM96K4BJteJnFxsXgG8zYpadU9oU8fRVhpDV/rgd3W80 u/UylE9ftTw9fMQEkYDikMRAk+1jMhuoNUTlmvZPctXS0AKPOJCOfIuUEIwtGd9TVb0dt4 N9Pquo821gbG06j1sZL9A53OcpJEZStx5btoi4w8N6CeUX8U1lyPzVUb3yCU6f/+fAgIMi umgTIjSBr+tF+bfIknmdamxRW0oFjT8k9il6g3jjVpVA2VJMbGNixnkZqwnPRuJlQRRrHW 3VYp2oolfBnepqShmP3IQBUky6Q3OOL7D36hSahROZg9+8EfqDTEnaHTsvsYWA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627754948; a=rsa-sha256; cv=none; b=ZysuYluHw+/sv4ta02j7tM7mxRb3DFlUTgL4kSWphvlmYQUxdIJ6dNA8wFq8iu6Tkq36J0 hLD6FXvGwePc08A0B3Ot5616JUgsk0gDC01ReSmEXumq7mUKBWpDDtxTpVa1En8JNQFI4R c6YqEkVsEB2pXFAc7/ztLPTgaQI2x+93FybF8AHpiSVtd9YFmKjij+f2jZrGBq+BUnOBOy wkEhwPWnA5FgMxd2KswLUPWwUpgsn4M4SC6pV1iI1HovQHrocSbJUWtfh7qzRnzKxwkD76 Bq2qZMa+LKlZ7uhWlqbb3LTQDktRZDAuyp+znF39NrDfRd6zVzIIW1iK1kTsSQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=CQfbPm+q; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.82 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=CQfbPm+q; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 28BCE2D0D3 X-Spam-Score: -1.82 X-Migadu-Scanner: scn1.migadu.com X-TUID: /hBwX2TFTf8R This is a multi-part message in MIME format. --b1_kCf0xPQm51ChUGEx9VCM75Xu5LRFEQDZKWBNNWMBCW8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Attached is a patch to fix failures for mesa-opencl and mesa-opencl-icd bui= lding with the update to 21.1.6 for Mesa. This is from upstream, a change i= n meson.build that removed LLVM targets (for CMake users it seems) but then= breaks compilation for us on a shared library LLVM build. https://gitlab.freedesktop.org/mesa/mesa/-/issues/4443 https://gitlab.freedesktop.org/mesa/mesa/-/issues/4302 And the commit that changed it: https://gitlab.freedesktop.org/mesa/mesa/-/= commit/80817b6e344258ac9b955f824ebf9019a0fc1610 The patch restores 'all-targets' to llvm_modules and successfully builds. A= pologies about the long line and I'm still guessing at some of the scheme p= atching code. Since Mesa takes a while to build I didn't want to go through= many iterations to get the code cleaner. Please feel free to make it bette= r, and I would think mesa-opencl-icu should be able to inherit the patch fr= om mesa-opencl, but I didn't try to do that. Thanks, John --b1_kCf0xPQm51ChUGEx9VCM75Xu5LRFEQDZKWBNNWMBCW8 Content-Type: text/x-patch; name=0001-gnu-mesa-fix-mesa-opencl-and-mesa-opencl-icd-21.1.6.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-mesa-fix-mesa-opencl-and-mesa-opencl-icd-21.1.6.patch RnJvbSA5Mjc0NGU5ZjU0ZGI5OTMxMjUzZTE3MjQ1ZDJjMzg0MWM2YWM2MzY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIEtlaGF5aWFzIDxqb2huLmtlaGF5aWFzQHByb3Rvbm1h aWwuY29tPgpEYXRlOiBTYXQsIDMxIEp1bCAyMDIxIDEzOjU3OjM3IC0wNDAwClN1YmplY3Q6IFtQ QVRDSF0gZ251OiBtZXNhOiBmaXggbWVzYS1vcGVuY2wgYW5kIG1lc2Etb3BlbmNsLWljZCAyMS4x LjYKCiogZ251L3BhY2thZ2VzL2dsLnNjbSAobWVzYS1vcGVuY2wpOiBSZXN0b3JlIExMVk0gdGFy Z2V0cyB0byBtZXNvbi5idWlsZAoqIGdudS9wYWNrYWdlcy9nbC5zY20gKG1lc2Etb3BlbmNsLWlj ZCk6IFJlc3RvcmUgTExWTSB0YXJnZXRzIHRvIG1lc29uLmJ1aWxkCi0tLQogZ251L3BhY2thZ2Vz L2dsLnNjbSB8IDE4ICsrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2Vy dGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ2wuc2Nt IGIvZ251L3BhY2thZ2VzL2dsLnNjbQppbmRleCBlMzE2MzUyMzc3Li5jZGQ5OGRkOGZkIDEwMDY0 NAotLS0gYS9nbnUvcGFja2FnZXMvZ2wuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9nbC5zY20KQEAg LTQ3NCw3ICs0NzQsMTYgQEAgZnJvbSBzb2Z0d2FyZSBlbXVsYXRpb24gdG8gY29tcGxldGUgaGFy ZHdhcmUgYWNjZWxlcmF0aW9uIGZvciBtb2Rlcm4gR1BVcy4iKQogICAgIChhcmd1bWVudHMKICAg ICAgKHN1YnN0aXR1dGUta2V5d29yZC1hcmd1bWVudHMgKHBhY2thZ2UtYXJndW1lbnRzIG1lc2Ep CiAgICAgICAgKCgjOmNvbmZpZ3VyZS1mbGFncyBmbGFncykKLSAgICAgICAgYChjb25zICItRGdh bGxpdW0tb3BlbmNsPXN0YW5kYWxvbmUiICxmbGFncykpKSkKKyAgICAgICAgYChjb25zICItRGdh bGxpdW0tb3BlbmNsPXN0YW5kYWxvbmUiICxmbGFncykpCisgICAgICAgKCgjOnBoYXNlcyBwaGFz ZXMpCisgICAgICAgIGAobW9kaWZ5LXBoYXNlcyAscGhhc2VzCisgICAgICAgICAgIChhZGQtYWZ0 ZXIgJ3VucGFjayAnZW5hYmxlLWxsdm0tcGxhdGZvcm1zCisgICAgICAgICAgICAgKGxhbWJkYSog KCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAgICA7OyBSZXN0 b3JlIGFsbCBMTFZNIHRhcmdldHMgaW4gb3JkZXIgdG8gYnVpbGQgd2l0aCBvdXIgTExWTQorICAg ICAgICAgICAgICAgOzsgYXMgYSBzaGFyZWQgbGlicmFyeS4KKyAgICAgICAgICAgICAgIChzdWJz dGl0dXRlKiAibWVzb24uYnVpbGQiCisgICAgICAgICAgICAgICAgICgoIidsaW5rZXInLCAnY292 ZXJhZ2UnLCAnaW5zdHJ1bWVudGF0aW9uJywgJ2lwbycsICdpcnJlYWRlcicsIikKKyAgICAgICAg ICAgICAgICAgICInYWxsLXRhcmdldHMnLCAnbGlua2VyJywgJ2NvdmVyYWdlJywgJ2luc3RydW1l bnRhdGlvbicsICdpcG8nLCAnaXJyZWFkZXInLCIpKSkpKSkpKQogICAgIChpbnB1dHMKICAgICAg YCgoImxpYmNsYyIgLGxpYmNsYykKICAgICAgICAsQChwYWNrYWdlLWlucHV0cyBtZXNhKSkpCkBA IC00OTIsNiArNTAxLDEzIEBAIGZyb20gc29mdHdhcmUgZW11bGF0aW9uIHRvIGNvbXBsZXRlIGhh cmR3YXJlIGFjY2VsZXJhdGlvbiBmb3IgbW9kZXJuIEdQVXMuIikKICAgICAgICAgICAgICAgICAs KGRlbGV0ZSAiLURnYWxsaXVtLW9wZW5jbD1zdGFuZGFsb25lIiBmbGFncykpKQogICAgICAgICAo KCM6cGhhc2VzIHBoYXNlcykKICAgICAgICAgIGAobW9kaWZ5LXBoYXNlcyAscGhhc2VzCisgICAg ICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2VuYWJsZS1sbHZtLXBsYXRmb3JtcworICAgICAg ICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAg ICAgICAgICAgIDs7IFJlc3RvcmUgYWxsIExMVk0gdGFyZ2V0cyBpbiBvcmRlciB0byBidWlsZCB3 aXRoIG91ciBMTFZNCisgICAgICAgICAgICAgICA7OyBhcyBhIHNoYXJlZCBsaWJyYXJ5LgorICAg ICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAibWVzb24uYnVpbGQiCisgICAgICAgICAgICAgICAg ICAoKCInbGlua2VyJywgJ2NvdmVyYWdlJywgJ2luc3RydW1lbnRhdGlvbicsICdpcG8nLCAnaXJy ZWFkZXInLCIpCisgICAgICAgICAgICAgICAgICAgIidhbGwtdGFyZ2V0cycsICdsaW5rZXInLCAn Y292ZXJhZ2UnLCAnaW5zdHJ1bWVudGF0aW9uJywgJ2lwbycsICdpcnJlYWRlcicsIikpKSkKICAg ICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ21lc2EtaWNkLWFic29sdXRlLXBhdGgKICAg ICAgICAgICAgICAgKGxhbWJkYSBfCiAgICAgICAgICAgICAgICAgOzsgVXNlIGFic29sdXRlIHBh dGggZm9yIE9wZW5DTCBwbGF0Zm9ybSBsaWJyYXJ5LgotLSAKMi4zMi4wCgo= --b1_kCf0xPQm51ChUGEx9VCM75Xu5LRFEQDZKWBNNWMBCW8--