diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-10-11 16:14:23 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-10-11 16:14:23 +0200 |
| commit | 5a5663e7fa4f131fb540c090f1fbeb57e444480f (patch) | |
| tree | f4c8dbfb3841d91ae81113d6122c6d8b8074ca8a | |
| parent | net-misc/spiped: Stable for amd64. Fixes bug 562826. (diff) | |
| parent | media-libs/libass: Fix building for x32, bug #509460 (diff) | |
| download | gentoo-5a5663e7fa4f131fb540c090f1fbeb57e444480f.tar.gz gentoo-5a5663e7fa4f131fb540c090f1fbeb57e444480f.tar.bz2 gentoo-5a5663e7fa4f131fb540c090f1fbeb57e444480f.zip | |
media-libs/libass: Merge "Fix building for x32"
Pull-Request: https://github.com/gentoo/gentoo/pull/171
| -rw-r--r-- | media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch | 26 | ||||
| -rw-r--r-- | media-libs/libass/libass-0.13.0.ebuild | 5 |
2 files changed, 31 insertions, 0 deletions
diff --git a/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch new file mode 100644 index 000000000000..3688aad4a4d7 --- /dev/null +++ b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch @@ -0,0 +1,26 @@ +From 4778001b673c73133d7d1dd48a385d0ca424ccfc Mon Sep 17 00:00:00 2001 +From: Luke Dashjr <luke-jr+git@utopios.org> +Date: Sat, 10 Oct 2015 08:11:38 +0000 +Subject: [PATCH] configure: Set the correct x32 machine option for yasm + +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 117b23b..d6fbe34 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,6 +56,12 @@ AS_IF([test x$enable_asm != xno], [ + X86=true + BITS=32 + ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ], ++ [x86_64-*-gnux32|amd64-*-gnux32], [ ++ AS=yasm ++ INTEL=true ++ X64=true ++ BITS=64 ++ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ], + [x86_64-*|amd64-*], [ + AS=yasm + INTEL=true diff --git a/media-libs/libass/libass-0.13.0.ebuild b/media-libs/libass/libass-0.13.0.ebuild index 20df06146ee7..3646359d0d5f 100644 --- a/media-libs/libass/libass-0.13.0.ebuild +++ b/media-libs/libass/libass-0.13.0.ebuild @@ -31,6 +31,11 @@ done DOCS="Changelog" +src_prepare() { + # bug #509460 + epatch "${FILESDIR}/${PV}-configure-Set-the-correct-x32-machine-option-for-yas.patch" +} + multilib_src_configure() { ECONF_SOURCE="${S}" econf \ $(use_enable fontconfig) \ |