From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EDffC9KBCWGKtwAAgWs5BA (envelope-from ) for ; Tue, 03 Aug 2021 19:50:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +CymB9KBCWHmWAAA1q6Kng (envelope-from ) for ; Tue, 03 Aug 2021 17:50:10 +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 B22751CF2F for ; Tue, 3 Aug 2021 19:50:09 +0200 (CEST) Received: from localhost ([::1]:52086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAyYK-0000bg-Lx for larch@yhetil.org; Tue, 03 Aug 2021 13:50:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAyYE-0000ab-VH for guix-patches@gnu.org; Tue, 03 Aug 2021 13:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAyYE-0002Yj-Om for guix-patches@gnu.org; Tue, 03 Aug 2021 13:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAyYE-0001KX-KA for guix-patches@gnu.org; Tue, 03 Aug 2021 13:50:02 -0400 Subject: bug#49794: [PATCH core-updates-frozen] fix mesa-opencl and mesa-opencl-icd build failure Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 03 Aug 2021 17:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 49794 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: 49794-done@debbugs.gnu.org Mail-Followup-To: 49794@debbugs.gnu.org, ludo@gnu.org, john.kehayias@protonmail.com Received: via spool by 49794-done@debbugs.gnu.org id=D49794.16280129915087 (code D ref 49794); Tue, 03 Aug 2021 17:50:02 +0000 Received: (at 49794-done) by debbugs.gnu.org; 3 Aug 2021 17:49:51 +0000 Received: from localhost ([127.0.0.1]:41350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAyY3-0001Jz-Ca for submit@debbugs.gnu.org; Tue, 03 Aug 2021 13:49:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAyY1-0001Jl-MT for 49794-done@debbugs.gnu.org; Tue, 03 Aug 2021 13:49:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57344) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAyXw-0002Ms-8c; Tue, 03 Aug 2021 13:49:44 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45356 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAyXv-0004TV-W9; Tue, 03 Aug 2021 13:49:44 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Tue, 03 Aug 2021 19:49:41 +0200 In-Reply-To: (John Kehayias's message of "Sat, 31 Jul 2021 18:08:28 +0000") Message-ID: <87tuk6s9je.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628013010; 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-to: 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; bh=OAmdmbnvE7vCkQ+J82naXF5yjqEmvzhkpXG0TCa5pKY=; b=uc924yp1AFe7WlTZjDZakHAn4n8R/QRRjaEzrvLyd6nBcQbtOu7igb+hc3u3wE1nUR4JJu zsYq3L7OTsAg1uWtCvi5urS8+ryPD/6DT2ey1CCf4tDuaTlrTI4aLKzf8tQCZsr0b0tih8 /V4EXjwG2anN/CK1oVPQCTjYRXlPPfS5HVhbiR1ZZgCSFFNZMY7zA9ZhBRrmoZDsChWefJ M/rYJB3ON5wcfj+XxwIm+UHrlkezVGrs/Kk3XVWx5UUPN53SaHk1GVl/0l3OgzYRbIiSe9 ctMHElHvx7VbFXoY2uZjFuYk95UrFrceyjVl/U9zAijZ/RG4FusMtjaGdMLLGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628013010; a=rsa-sha256; cv=none; b=NoC3GTYUTcxv4wsbB4wvapmqsrYqDIDqo/m38YMC7yrGsH7Fe1DLXOrzAe0pxGK99BzxU+ MUg3//qleEcgVj4fygilRiwOLGSdUNSvW5eVlc6yv/0mYkynEpxcJ0asAcMkLf+wU8gioV LKmkID+WGdBbH36/1PmcZiPgXkC4kDhPVt7M5GoFwDSKdHSpEU6CW5NvzQ1Fo0FqFKhxYx fuBH2lq7S6DQqWjBTUdrh3/V9faU4WBNxwk0A64vqldbZ6H7KNQ0+DevSNn8nj75pSm3Rq vXLQq5/r29uBKqgyiyf4C7Uk6YRXa9VvH3n69LCz9sV6yW+3BNNuN++8PtkenQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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: -2.91 Authentication-Results: aspmx1.migadu.com; dkim=none; 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: B22751CF2F X-Spam-Score: -2.91 X-Migadu-Scanner: scn1.migadu.com X-TUID: Dz+bE6CVMWx+ Hi John, John Kehayias skribis: > Attached is a patch to fix failures for mesa-opencl and mesa-opencl-icd b= uilding with the update to 21.1.6 for Mesa. This is from upstream, a change= in meson.build that removed LLVM targets (for CMake users it seems) but th= en 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.= Apologies about the long line and I'm still guessing at some of the scheme= patching code. Since Mesa takes a while to build I didn't want to go throu= gh many iterations to get the code cleaner. Please feel free to make it bet= ter, and I would think mesa-opencl-icu should be able to inherit the patch = from mesa-opencl, but I didn't try to do that. [...] > + ((#:phases phases) > + `(modify-phases ,phases > + (add-after 'unpack 'enable-llvm-platforms > + (lambda* (#:key inputs #:allow-other-keys) > + ;; Restore all LLVM targets in order to build with our LL= VM > + ;; as a shared library. > + (substitute* "meson.build" > + (("'linker', 'coverage', 'instrumentation', 'ipo', 'irr= eader',") > + "'all-targets', 'linker', 'coverage', 'instrumentation= ', 'ipo', 'irreader',")))))))) I feel this is easier to follow when expressed as a good old patch, so I took the liberty to do that and pushed it as 1685128e6e1147049feddee617a616ce7f3592c0. Let me know if anything=E2=80=99s amiss. Thanks! Ludo=E2=80=99.