From nobody Fri Nov 24 06:14:59 2023
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sc4TJ00Fpz51N3C;
Fri, 24 Nov 2023 06:15:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Sc4TH43L1z4QDh;
Fri, 24 Nov 2023 06:14:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1700806499;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=05APzFa+ZcysPPZH3H/5MEj71xrs4lt9ZNXGD8jXbM4=;
b=FjlgrjYe+qnccwzc3oC/HdgctH/ThCR9g8lVOlQ3xFBOMLRc/tu8iprZR9sI/cU29DstGx
gixXEsaenQ1fHI5vf92Xfd17RZ9A1oL29w+iFQZQ3HOu+Va1QY/MWqxLchzuG8XxbnB4by
tiqC8goRBFslACttqWwDI8s2vd1AIQa1/y18qlV9CuZJyuIu1BvjUthYhw5ylPlEN8ZXPl
pp5seMa8bWOtfGDH4Ky6eJTgWNL0pD7MFbvs9R5izDENq3FnfCZbsSU8RSfERpaWF308Y0
o4OC6EW4+8vu1it6shKQALFccWFNcFQaBWhtkHUARH653tMg3SAOkRPZTA/1SQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1700806499;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=05APzFa+ZcysPPZH3H/5MEj71xrs4lt9ZNXGD8jXbM4=;
b=O3mfMADm/ewabV0ZCBy7knO6/seuMp89POwbAvtFGtW548Yt097ySo5mK4C19cmipd98Nc
NsJKgPy6OHyYHZjlYtdiSOIsUHs6i1xDrjDikHM3+NFmEk8Zz2cMwu7ecuwhNNavgGeRdY
d/3kpiOsoNgZQT6fTFoxUNM9fy/ct89cyRZ/UrWPKlPn/2qK/XdBeX8xDdzEUPqyO0RW0F
Me52Gw+URpi8ewTNTu91dRQCaLi/QlN+3JbgqwlOgrpgjErtHozYEUCSDg49AAX4y5UTcH
90EMAb8O0TpjmkeYa4Cw13cWro4KO3upfT2YTF0QOWEj/M2yDXZSL0u9RlwL1g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700806499; a=rsa-sha256; cv=none;
b=nocLelVNmYmtr+b3RF8yWaCivlCIK7PAQqZN1xzmTYVdCMbYzLDDs7hMptJnk5yTN04fQx
RfFIzC182UNGWOC0q7xsiP1SZzTd5zzBwc0V50Ewn4j+IbqdBZn25Mb8K3SGI2gGA2OeI9
FBmwVh2oEzTNmUxKWiXscjgm0iRG/+nHVAP0Y4ekEX7d8PkFvLZ2PSYLMiyWPxfLVLjAoG
LXve6APfojmyBtRhND2cJzc7+iOmgKde1ZHrTxSD0IZAZokzlUvnsD/3oEVwEZwQO/Ozor
YFHj7G37PZyZw0/xAV+MfYUj6qvNzDv96swhsXDCLQA3zd1st9d5m8m9pytV1A==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sc4TH393hzZPN;
Fri, 24 Nov 2023 06:14:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AO6ExGH027974;
Fri, 24 Nov 2023 06:14:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO6Exen027971;
Fri, 24 Nov 2023 06:14:59 GMT
(envelope-from git)
Date: Fri, 24 Nov 2023 06:14:59 GMT
Message-Id: <202311240614.3AO6Exen027971@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Robert Clausecker <fuz@FreeBSD.org>
Subject: git: b632464b29fc - main - x11-servers/xorg-server: fix
build on armv6/armv7
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fuz
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: b632464b29fc330113280495ef76d0f825058ae8
Auto-Submitted: auto-generated
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b632464b29fc330113280495ef76d0f825058ae8
commit b632464b29fc330113280495ef76d0f825058ae8
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:12:35 +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
---
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'