From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2CaHH1VTlWaLDQAAe85BDQ:P1 (envelope-from ) for ; Mon, 15 Jul 2024 16:50:29 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2CaHH1VTlWaLDQAAe85BDQ (envelope-from ) for ; Mon, 15 Jul 2024 18:50:29 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=S2Pkv2lZ; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1721062229; 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=fLjziaq19aYq/VLh+OhmixZGeR2D1CiBDFHQSXpl98E=; b=XZHL8QeuyStZplRORKAzrZn/r5s5lWyj+GtMZvRbR1uFuzt5Nv4RkJUn5ssILahQC282Qn b7NRjkHL4rDwwFQUkGtfdOwHq0WvT1/N3rAeNZGNwUiKAeUT4/jAhdvbh3+/4Gzq1TGzq7 kl2czwfhWeXUreGT/TiOb3KbC/VVPt7+pM4BLoZgVKTzCUSyTRsciZbyU9M/XaQ6X2JkL/ ihtaecL4Np56x3fBr4XXPUFnhB1hj5ddA0pSLF+PaLn4wjodYqDs3v4R7U6/UyKZUJ+VAo QJTvMmCeAcDIfTXSyDeJJXwedkYHkrysOsQ4vuXwSCY5bLzawXiNdytsOeUKeQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=S2Pkv2lZ; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721062229; a=rsa-sha256; cv=none; b=MAhS+3d9t/V3PcEbW0z1uLbY8B6W059+mbHR/RqTJpalJ6vwBzFTbN1E7XHLWWziF4wC7M u7gOiBDPxLAda2zVB1wDLL4WLNgAu+EShHva6Qg+5iUVgpm0qQj9htDjlRqTWFw+VWDkp8 vqqUR3HtpmhHv7QwlOgDtIj64Dzhzm0t/gXqg+et9xRPnlvRAhoPV7eTR1s1O71H2uvfuW 1657H49IZZtv3AXiozusZfwHDavUBctjy/7X2xsIKsHXmv1RBFDy7Pd1K64NlT/P+KG96J SX6j1QFZfVgzUw/BWTi8bYY3HHCwfLjfZM+DJCSuk+aZjbOxfoNCN+zG7Mb3Xg== 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 232F815FDF for ; Mon, 15 Jul 2024 18:50:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTOto-00055X-9Z; Mon, 15 Jul 2024 12:50: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 1sTOtk-00051a-Jw for guix-patches@gnu.org; Mon, 15 Jul 2024 12:50:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sTOtk-0002a3-Bm for guix-patches@gnu.org; Mon, 15 Jul 2024 12:50:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sTOtm-0004DX-Dw for guix-patches@gnu.org; Mon, 15 Jul 2024 12:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72043] [PATCH core-updates 1/3] gnu: mesa: Fix building on aarch64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Jul 2024 16:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72043@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 72043-submit@debbugs.gnu.org id=B72043.172106214616125 (code B ref 72043); Mon, 15 Jul 2024 16:50:02 +0000 Received: (at 72043) by debbugs.gnu.org; 15 Jul 2024 16:49:06 +0000 Received: from localhost ([127.0.0.1]:60322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTOss-0004C0-8r for submit@debbugs.gnu.org; Mon, 15 Jul 2024 12:49:06 -0400 Received: from mail-yb1-f174.google.com ([209.85.219.174]:57807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTOso-0004Ao-U3 for 72043@debbugs.gnu.org; Mon, 15 Jul 2024 12:49:03 -0400 Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-e057c4885b3so4145993276.3 for <72043@debbugs.gnu.org>; Mon, 15 Jul 2024 09:49:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721062075; x=1721666875; darn=debbugs.gnu.org; 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=fLjziaq19aYq/VLh+OhmixZGeR2D1CiBDFHQSXpl98E=; b=S2Pkv2lZlVnqgiJ7tDi/yBlDu+08+ar16Hm9vkkoCTTgQrVpukkrrLTJ/qq2ARwYKI 7ZTEeHf7f7dIxV1lJTWDqsM0/6tjz5X+L/vN4LX05fqtyxnvAjs9y4bLuQew9SRHW+T/ /6pmzUEK6v8HUpYiSI7dcZ+LbdD4nBgaD4EhATzDuejA0gynoTxv/0EKYCJB85VqxkXr k5n5ZLBEIhEVzyiLernmZYWiXEDnI+QMmmrhMorqorVKvfRGI7Yy7AXEmk2kpOwdNphf Z9Ko8Sz7dXkpFl3VwG4P0QLoyf11WniaoqkcJAwZYuEYdGm0LouAvvr20UB6CweeTfw6 44Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721062075; x=1721666875; 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=fLjziaq19aYq/VLh+OhmixZGeR2D1CiBDFHQSXpl98E=; b=JmACBFlESIqjLHZ2uFlBxMoWuituN2qwCSb3pBTGe59AqdYGgXxOV8xw+GJMF+NaZb JLtWbrFbOiB3J31WNbC51DITUTTlFoVVaTh5rw90HLOP2TSz8SDwWNRkGA2ETzIq2oAx 1vNnHl6ptGp8b/lajex6IfaTmcM3Etn2RKhgcyaKkp5PnYEQQALvXsS0CgMt8qEXpltD EtpSuuoZ5vHktR9px6dqUGI+1CRU8tvILgZUEzflVyBtZdYFoYj8rbUVy0PuPCJ8TUCS NyfARp0Q51JI4QwttGS0IalPNJrVyYfsqz2qaDjMFQyI/LEfCseWFuje9JchqJ8AmeJt XIgQ== X-Gm-Message-State: AOJu0YxP0cNJyaF+/4PmlpgfhKWnLbSj/aoZPTXtOTLeOHfp7nDInzqX Ssj+DSle8X3u5S+PMAJdoCJn4TY0l3cq4HhDQNWy4uBNyrVIPolIDJULo+X5 X-Google-Smtp-Source: AGHT+IEiZn4DgLZbOjMSGkDi4uXigBwkU2sdPFHoHUKF/VWN1VVJ0Q0pIxYUD+ppf47BpFwLbELUhw== X-Received: by 2002:a25:a28d:0:b0:e03:4ba6:8fb with SMTP id 3f1490d57ef6-e05d3bd39c6mr111902276.59.1721062075020; Mon, 15 Jul 2024 09:47:55 -0700 (PDT) Received: from localhost (ool-ad039216.dyn.optonline.net. [173.3.146.22]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a160be34dfsm214398285a.70.2024.07.15.09.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 09:47:54 -0700 (PDT) From: Efraim Flashner Date: Mon, 15 Jul 2024 19:47:35 +0300 Message-ID: <24cc5fe2eb0275896cc9cb0b8b58abb9a20fe491.1720642893.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.45.2 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 X-Migadu-Queue-Id: 232F815FDF X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -4.40 X-Spam-Score: -4.40 X-TUID: GZztRfAhkdN4 Message-ID: <20240715164735.pv30nc1S2RhY-BYrHQ6c8nptgvQW20ai1g2KkESsrEg@z> * gnu/packages/gl.scm (mesa)[inputs]: When building for aarch64-linux use clang-18 and llvm-18 instead of llvm-for-mesa. [native-inputs]: When building for aarch64-linux add libclc. [arguments]: Adjust the 'disable-failing-test phase when building for aarch64-linux to skip a test. (mesa-opencl)[native-inputs]: When building for aarch64-linux don't add clang-15. * gnu/packages/check.scm (python-lit), * gnu/packages/llvm.scm (libclc), * gnu/packages/vulkan.scm (spirv-llvm-translator): Add a note about it being a dependency for mesa. Change-Id: I0bf5ab019ffd0626ad2d0c38bafceec401e3c886 --- gnu/packages/check.scm | 1 + gnu/packages/gl.scm | 56 +++++++++++++++++++++++++---------------- gnu/packages/llvm.scm | 1 + gnu/packages/vulkan.scm | 1 + 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index bc341943f02..c24878937f3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2577,6 +2577,7 @@ (define-public python-hypothesmith programs, something like CSmith, a random generator of C programs.") (license license:mpl2.0))) +;; WARNING: This package is a dependency of mesa. (define-public python-lit (package (name "python-lit") diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 80ba2cdcb09..43a452acb6a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -320,19 +320,24 @@ (define-public mesa libxxf86vm xorgproto)) (inputs - (list elfutils ;libelf required for r600 when using llvm - expat - (force libva-without-mesa) - libxml2 - libxrandr - libxvmc - llvm-for-mesa - vulkan-loader - wayland - wayland-protocols - `(,zstd "lib"))) + (append + (if (target-aarch64?) + (list clang-18 + llvm-18) + (list llvm-for-mesa)) + (list elfutils ;libelf required for r600 when using llvm + expat + (force libva-without-mesa) + libxml2 + libxrandr + libxvmc + vulkan-loader + wayland + wayland-protocols + `(,zstd "lib")))) (native-inputs - (cons* bison + (append + (list bison flex gettext-minimal glslang @@ -340,13 +345,16 @@ (define-public mesa python-libxml2 ;for OpenGL ES 1.1 and 2.0 support python-mako python-wrapper - (@ (gnu packages base) which) - (if (%current-target-system) - (list cmake-minimal-cross - pkg-config-for-build - wayland - wayland-protocols) - '()))) + (@ (gnu packages base) which)) + (if (target-aarch64?) + (list libclc) + '()) + (if (%current-target-system) + (list cmake-minimal-cross + pkg-config-for-build + wayland + wayland-protocols) + '()))) (outputs '("out" "bin")) (arguments (list @@ -464,6 +472,10 @@ (define-public mesa ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091). `((substitute* "src/util/meson.build" ((".*'tests/u_debug_stack_test.cpp',.*") "")))) + ("aarch64-linux" + ;; Disable some of the llvmpipe tests. + `((substitute* "src/gallium/drivers/llvmpipe/meson.build" + (("'lp_test_format', ") "")))) ("armhf-linux" ;; Disable some of the llvmpipe tests. `((substitute* "src/gallium/drivers/llvmpipe/meson.build" @@ -586,8 +598,10 @@ (define-public mesa-opencl (modify-inputs (package-inputs mesa) (prepend libclc))) (native-inputs - (modify-inputs (package-native-inputs mesa) - (prepend clang-15))))) + (if (target-aarch64?) + (package-native-inputs mesa) + (modify-inputs (package-native-inputs mesa) + (prepend clang-15)))))) (define-public mesa-opencl-icd (package/inherit mesa-opencl diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a1a2c9dc1b9..b32b4b5955c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1915,6 +1915,7 @@ (define-public libcxx+libcxxabi-6 (native-inputs (list clang-6 llvm-6 libcxxabi-6)))) +;; WARNING: This package is a dependency of mesa. (define-public libclc (package (name "libclc") diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 25542c1e064..befd5325b58 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -152,6 +152,7 @@ (define-public spirv-cross SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (license license:asl2.0))) +;; WARNING: This package is a dependency of mesa. (define-public spirv-llvm-translator (package (name "spirv-llvm-translator") -- Efraim Flashner רנשלפ םירפא GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted