| 1 |
commit: 18745f353da4ddd132b344f0f20e035dfa917b93 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 7 02:14:32 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 7 02:14:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18745f35 |
| 7 |
|
| 8 |
x11-libs/pixman: fix build with ARM + Clang |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/768138 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-libs/pixman/pixman-0.40.0.ebuild | 7 ++++++- |
| 14 |
x11-libs/pixman/pixman-9999.ebuild | 9 +++++++-- |
| 15 |
2 files changed, 13 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild |
| 18 |
index 90fff3bb904..a269bcee708 100644 |
| 19 |
--- a/x11-libs/pixman/pixman-0.40.0.ebuild |
| 20 |
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild |
| 21 |
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then |
| 22 |
GIT_ECLASS="git-r3" |
| 23 |
fi |
| 24 |
|
| 25 |
-inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs |
| 26 |
+inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs |
| 27 |
|
| 28 |
DESCRIPTION="Low-level pixel manipulation routines" |
| 29 |
HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" |
| 30 |
@@ -28,6 +28,11 @@ multilib_src_configure() { |
| 31 |
local openmp=disabled |
| 32 |
tc-has-openmp && openmp=enabled |
| 33 |
|
| 34 |
+ if use arm && tc-is-clang ; then |
| 35 |
+ # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 |
| 36 |
+ append-cflags $(test-flags-CC -fno-integrated-as) |
| 37 |
+ fi |
| 38 |
+ |
| 39 |
local emesonargs=( |
| 40 |
$(meson_feature cpu_flags_arm_iwmmxt iwmmxt) |
| 41 |
$(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) |
| 42 |
|
| 43 |
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild |
| 44 |
index d79304a2d1a..e6332d53863 100644 |
| 45 |
--- a/x11-libs/pixman/pixman-9999.ebuild |
| 46 |
+++ b/x11-libs/pixman/pixman-9999.ebuild |
| 47 |
@@ -9,14 +9,14 @@ if [[ ${PV} = 9999* ]]; then |
| 48 |
GIT_ECLASS="git-r3" |
| 49 |
fi |
| 50 |
|
| 51 |
-inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs |
| 52 |
+inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs |
| 53 |
|
| 54 |
DESCRIPTION="Low-level pixel manipulation routines" |
| 55 |
HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" |
| 56 |
if [[ ${PV} = 9999* ]]; then |
| 57 |
SRC_URI="" |
| 58 |
else |
| 59 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 60 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 61 |
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" |
| 62 |
fi |
| 63 |
|
| 64 |
@@ -28,6 +28,11 @@ multilib_src_configure() { |
| 65 |
local openmp=disabled |
| 66 |
tc-has-openmp && openmp=enabled |
| 67 |
|
| 68 |
+ if use arm && tc-is-clang ; then |
| 69 |
+ # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 |
| 70 |
+ append-cflags $(test-flags-CC -fno-integrated-as) |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
local emesonargs=( |
| 74 |
$(meson_feature cpu_flags_arm_iwmmxt iwmmxt) |
| 75 |
$(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) |
Archives