From 7fea5a85431c9392c436cbf613db8fa191a7e3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 14 Nov 2024 14:17:10 +0100 Subject: [PATCH] Do not build aarch64 drivers on x86 Resolves: https://issues.redhat.com/browse/RHEL-66062 --- mesa.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mesa.spec b/mesa.spec index d049676..6ffd6c0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -36,7 +36,7 @@ %endif %endif -%ifarch aarch64 x86_64 %{ix86} +%ifarch %{arm} aarch64 %if !0%{?rhel} %global with_etnaviv 1 %global with_lima 1 @@ -68,7 +68,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 24.2.6 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -715,7 +715,7 @@ popd %{_libdir}/dri/crocus_dri.so %{_libdir}/dri/iris_dri.so %endif -%ifarch aarch64 x86_64 %{ix86} +%ifarch %{arm} aarch64 %{_libdir}/dri/ingenic-drm_dri.so %{_libdir}/dri/imx-drm_dri.so %{_libdir}/dri/imx-lcdif_dri.so @@ -835,7 +835,7 @@ popd %{_libdir}/libvulkan_intel_hasvk.so %{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json %endif -%ifarch aarch64 x86_64 %{ix86} +%ifarch %{arm} aarch64 %{_libdir}/libvulkan_broadcom.so %{_datadir}/vulkan/icd.d/broadcom_icd.*.json %{_libdir}/libvulkan_freedreno.so @@ -849,6 +849,10 @@ popd %endif %changelog +* Thu Nov 14 2024 José Expósito - 24.2.6-2 +- Do not build aarch64 drivers on x86 + Resolves: https://issues.redhat.com/browse/RHEL-66062 + * Tue Nov 12 2024 José Expósito - 24.2.6-1 - Update to 24.2.6 Resolves: https://issues.redhat.com/browse/RHEL-66062