From nobody Fri Nov 24 06:18:01 2023 X-Original-To: dev-commits-ports-branches@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 4Sc4Xn56TLz51PCM; Fri, 24 Nov 2023 06:18:01 +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 4Sc4Xn4kFBz4ST7; Fri, 24 Nov 2023 06:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700806681; 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=lxyWTZA2YHzqmRg/nddtxq5F5kcqhzURx0RT9z7c/8Q=; b=sTFejPnFvSmbQdWXSRIfMS6iVsBMPveGRB+Ze+G588H5LmeWzL5kd2isNbE4XGpWFvlMte Dw7lh0maSW1PLdeUS/xgRrrP+LiStr57aP+AscczCNUbO+DM2fLM2zs4/kj2aRD0BG3+cN lGI2XeR6lSe0cPYwVZ6dk+qcredPe5d/mitp/SaRxa7hYP2Sspo3wHLfNVNXhIXUqJKqd2 sQlPnP7ozRNs3/BywPnMCZfFRwPdBTbIpjy3diR981zgDfrqWuYi0EjLQuDloG/zrG1U6c 8eaFbzOfPV7xk0TfMT1M/dOqSAdYXJ0hNYwFiqrq8MOvpAy/WnKdB3pMQHNdVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700806681; 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=lxyWTZA2YHzqmRg/nddtxq5F5kcqhzURx0RT9z7c/8Q=; b=PZsvUclCQahK9Uh/HO+1q/40GxbDTW1gERC5lRvCGZs5xMSVlY6S46GoFZNUwUQEGam5Di 4J+IZD9OaaYyXcM9CLplQyRu0gbzygOdf6av/StkOVPtsA/Rm5Xf6goaP4eMhxm8UCGkbM 032wPFqhxixjBvFAPIccxBiL2H2rrwKveCP1G+ZLUrYnjrCEQvckGMabWCTCMcoVYcFbi3 z8R3rB+Ymdjb30IJ3bYgordKBoH6kd8AjDxLkqjTyaPGEYa1OcT5Je0D+M5kTHUQ7zPam/ R8mE11usgktGsby/cwJBPPmYdErnInujW9YGEpT7lKTht82wKy2pNHA9Rvlnlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700806681; a=rsa-sha256; cv=none; b=Zgou9z8ECPJK3ZGKGPa11qKmzFIhZ5Y1yvcygKG3wvc7veyZK+mZYTl7iDuU2giwio+aoE wGhCuHuQpnyGvi+Kkn1RDGIC8gQt3Ih0apeFD3b8vtAdg4jS9pDgQTm3fXgguEqH0a8k/F hRQ0kfLpqNyuGd6LO0K3fqzMSmuTRC1UVGSJZTd8+vmpFIMWkKcyTCIsqrLY1rya0hQn6D SfIYASPRv5MxA2kpCbaBoCOhx+z2GKFMKpE2IEtNp8HAdDmvwpJOUbvfDJdhhnBl4jjW7M VYhNr+0TYUUQ31Qg2dcnHyIxCn26r67bz3DvrmCcc4ZYmES4T6wIFDcH1vT/3w== 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 4Sc4Xn3mQqzZ2f; Fri, 24 Nov 2023 06:18:01 +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 3AO6I1ar029659; Fri, 24 Nov 2023 06:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO6I1I6029656; Fri, 24 Nov 2023 06:18:01 GMT (envelope-from git) Date: Fri, 24 Nov 2023 06:18:01 GMT Message-Id: <202311240618.3AO6I1I6029656@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: ca2712d6217e - 2023Q4 - x11-servers/xorg-server: fix build on armv6/armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: ca2712d6217eef1540599394f705d99c29539a77 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca2712d6217eef1540599394f705d99c29539a77 commit ca2712d6217eef1540599394f705d99c29539a77 Author: Robert Clausecker AuthorDate: 2023-11-20 20:02:51 +0000 Commit: Robert Clausecker 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'