From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7755158020 for ; Thu, 24 Nov 2022 11:27:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19863E0869; Thu, 24 Nov 2022 11:27:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 046DBE0869 for ; Thu, 24 Nov 2022 11:27:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 152CF340F3A for ; Thu, 24 Nov 2022 11:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D304760 for ; Thu, 24 Nov 2022 11:27:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1669289235.20d3f0132014dc3f5c321b0d457d985c1e04171d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-21.1.4.ebuild x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 20d3f0132014dc3f5c321b0d457d985c1e04171d X-VCS-Branch: master Date: Thu, 24 Nov 2022 11:27:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b291ec95-6c9b-44e5-9105-7515ecc9e61f X-Archives-Hash: e7d580d8ed9b10f223f3f80b7a8be9c6 commit: 20d3f0132014dc3f5c321b0d457d985c1e04171d Author: Sam James gentoo org> AuthorDate: Thu Nov 24 11:27:15 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 24 11:27:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d3f013 x11-base/xorg-server: replace -Os w/ -O2 Closes: https://bugs.gentoo.org/835653 Signed-off-by: Sam James gentoo.org> x11-base/xorg-server/xorg-server-21.1.4.ebuild | 6 ++++-- x11-base/xorg-server/xorg-server-9999.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-21.1.4.ebuild b/x11-base/xorg-server/xorg-server-21.1.4.ebuild index 068d342b87c5..00ab2ea8f078 100644 --- a/x11-base/xorg-server/xorg-server-21.1.4.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 XORG_TARBALL_SUFFIX="xz" XORG_EAUTORECONF="no" -inherit xorg-3 meson +inherit flag-o-matic xorg-3 meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" @@ -103,10 +103,12 @@ PATCHES=( ) src_configure() { + # bug #835653 + use amd64 && replace-flags -Os -O2 + # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies - local emesonargs=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11" diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 85fc86f9ac72..316e0c3ba53c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 XORG_TARBALL_SUFFIX="xz" XORG_EAUTORECONF="no" -inherit xorg-3 meson +inherit flag-o-matic xorg-3 meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" @@ -103,10 +103,12 @@ PATCHES=( ) src_configure() { + # bug #835653 + use x86 && replace-flags -Os -O2 + # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies - local emesonargs=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11"