commit: f9ed8db9e68634a91c4fd53f32c8b0fd58f169b7
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sat May 3 13:20:15 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 13:19:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed8db9
media-libs/libass: Fix building for x32, bug #509460
Add upstream patch from commit 4778001 ("configure: Set the correct x32
machine option for yasm")
Package-Manager: portage-2.2.20.1
...et-the-correct-x32-machine-option-for-yas.patch | 26 ++++++++++++++++++++++
media-libs/libass/libass-0.13.0.ebuild | 5 +++++
2 files changed, 31 insertions(+)
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 0000000..3688aad
--- /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 <[email protected]>
+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 20df061..3646359 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) \
