mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-22 10:57:07 -08:00
Merge updates from master
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
|
||||
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
|
||||
|
||||
inherit distutils-r1 eutils versionator
|
||||
|
||||
|
||||
+26
@@ -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
|
||||
@@ -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) \
|
||||
|
||||
Reference in New Issue
Block a user