From 650f6b2bd1833b75c57ddf5d0a1c0cfede962a2f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:21 +0000 Subject: [PATCH] x11-libs/pixman: Sync with Gentoo It's from Gentoo commit 5b86df4fdf4c864e1023f60e838f194c42fadfa2. --- .../portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild | 4 ++-- .../portage-stable/x11-libs/pixman/pixman-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild index a374ef666c..2e5fa64a85 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ pkg_setup() { } multilib_src_configure() { - if use arm && tc-is-clang ; then + if ( use arm || use arm64 ) && tc-is-clang ; then # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 append-cflags $(test-flags-CC -fno-integrated-as) fi diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild index 1cd3dd3a43..e4c0e9e9a0 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ pkg_setup() { } multilib_src_configure() { - if use arm && tc-is-clang ; then + if ( use arm || use arm64 ) && tc-is-clang ; then # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 append-cflags $(test-flags-CC -fno-integrated-as) fi