Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Nov 2023 06:18:01 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: ca2712d6217e - 2023Q4 - x11-servers/xorg-server: fix build on armv6/armv7
Message-ID:  <202311240618.3AO6I1I6029656@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q4 has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ca2712d6217eef1540599394f705d99c29539a77

commit ca2712d6217eef1540599394f705d99c29539a77
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-11-20 20:02:51 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-11-24 06:16:16 +0000

    x11-servers/xorg-server: fix build on armv6/armv7
    
    This reinstates USE_DEV_IO=1 on arm, a patch that was dropped in the
    switch from autotools to meson.
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2023Q4
    
    (cherry picked from commit b632464b29fc330113280495ef76d0f825058ae8)
---
 x11-servers/xorg-server/files/patch-include_meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-servers/xorg-server/files/patch-include_meson.build b/x11-servers/xorg-server/files/patch-include_meson.build
index a873f548052d..b716f8efcb94 100644
--- a/x11-servers/xorg-server/files/patch-include_meson.build
+++ b/x11-servers/xorg-server/files/patch-include_meson.build
@@ -5,7 +5,7 @@
  
  if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
 -    if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
-+    if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64'
++    if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64' or host_machine.cpu_family() == 'aarch64' or host_machine.cpu_family() == 'arm'
          xorg_data.set('USE_DEV_IO', '1')
      endif
  elif host_machine.system() == 'netbsd'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311240618.3AO6I1I6029656>