| 1 |
commit: f9ed8db9e68634a91c4fd53f32c8b0fd58f169b7 |
| 2 |
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> |
| 3 |
AuthorDate: Sat May 3 13:20:15 2014 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 13:19:12 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed8db9 |
| 7 |
|
| 8 |
media-libs/libass: Fix building for x32, bug #509460 |
| 9 |
|
| 10 |
Add upstream patch from commit 4778001 ("configure: Set the correct x32 |
| 11 |
machine option for yasm") |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.20.1 |
| 14 |
|
| 15 |
...et-the-correct-x32-machine-option-for-yas.patch | 26 ++++++++++++++++++++++ |
| 16 |
media-libs/libass/libass-0.13.0.ebuild | 5 +++++ |
| 17 |
2 files changed, 31 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..3688aad |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch |
| 24 |
@@ -0,0 +1,26 @@ |
| 25 |
+From 4778001b673c73133d7d1dd48a385d0ca424ccfc Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Luke Dashjr <luke-jr+git@×××××××.org> |
| 27 |
+Date: Sat, 10 Oct 2015 08:11:38 +0000 |
| 28 |
+Subject: [PATCH] configure: Set the correct x32 machine option for yasm |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ configure.ac | 6 ++++++ |
| 32 |
+ 1 file changed, 6 insertions(+) |
| 33 |
+ |
| 34 |
+diff --git a/configure.ac b/configure.ac |
| 35 |
+index 117b23b..d6fbe34 100644 |
| 36 |
+--- a/configure.ac |
| 37 |
++++ b/configure.ac |
| 38 |
+@@ -56,6 +56,12 @@ AS_IF([test x$enable_asm != xno], [ |
| 39 |
+ X86=true |
| 40 |
+ BITS=32 |
| 41 |
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ], |
| 42 |
++ [x86_64-*-gnux32|amd64-*-gnux32], [ |
| 43 |
++ AS=yasm |
| 44 |
++ INTEL=true |
| 45 |
++ X64=true |
| 46 |
++ BITS=64 |
| 47 |
++ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ], |
| 48 |
+ [x86_64-*|amd64-*], [ |
| 49 |
+ AS=yasm |
| 50 |
+ INTEL=true |
| 51 |
|
| 52 |
diff --git a/media-libs/libass/libass-0.13.0.ebuild b/media-libs/libass/libass-0.13.0.ebuild |
| 53 |
index 20df061..3646359 100644 |
| 54 |
--- a/media-libs/libass/libass-0.13.0.ebuild |
| 55 |
+++ b/media-libs/libass/libass-0.13.0.ebuild |
| 56 |
@@ -31,6 +31,11 @@ done |
| 57 |
|
| 58 |
DOCS="Changelog" |
| 59 |
|
| 60 |
+src_prepare() { |
| 61 |
+ # bug #509460 |
| 62 |
+ epatch "${FILESDIR}/${PV}-configure-Set-the-correct-x32-machine-option-for-yas.patch" |
| 63 |
+} |
| 64 |
+ |
| 65 |
multilib_src_configure() { |
| 66 |
ECONF_SOURCE="${S}" econf \ |
| 67 |
$(use_enable fontconfig) \ |
Archives