commit: 20d3f0132014dc3f5c321b0d457d985c1e04171d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 24 11:27:15 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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"
