diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-29 22:07:07 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-29 22:07:07 +0000 |
| commit | 15ef7a417a5d832d97e0cfc613b6cef5107f1325 (patch) | |
| tree | 620d1e0110825195ed92018848929c6e29d695ec /profiles | |
| parent | systemd now has subslots (diff) | |
| download | gentoo-2-15ef7a417a5d832d97e0cfc613b6cef5107f1325.tar.gz gentoo-2-15ef7a417a5d832d97e0cfc613b6cef5107f1325.tar.bz2 gentoo-2-15ef7a417a5d832d97e0cfc613b6cef5107f1325.zip | |
Restore abi_x86_x32 mask since the relevant ABI is not in MULTILIB_ABIS and causes breakage.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/amd64/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/arch/amd64/use.mask | 3 | ||||
| -rw-r--r-- | profiles/arch/amd64/x32/use.mask | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index fd85d0bcdb16..419068419567 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.248 2014/03/29 02:41:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.249 2014/03/29 22:07:07 mgorny Exp $ + + 29 Mar 2014; Michał Górny <mgorny@gentoo.org> use.mask, +x32/use.mask: + Restore abi_x86_x32 mask since the relevant ABI is not in MULTILIB_ABIS and + causes breakage. 29 Mar 2014; Mike Frysinger <vapier@gentoo.org> use.mask, -x32/use.mask: Unmask abi_x86_x32 for all amd64 systems. diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask index 3ce5aba22cbc..d04837341a67 100644 --- a/profiles/arch/amd64/use.mask +++ b/profiles/arch/amd64/use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.56 2014/03/29 02:41:29 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.57 2014/03/29 22:07:07 mgorny Exp $ # Unmask the flag which corresponds to ARCH. -amd64 @@ -181,7 +181,6 @@ capslib # Unmask the multilib flags for this arch. -abi_x86_32 -abi_x86_64 --abi_x86_x32 # Andrey Grozin <grozin@gentoo.org> (1 May 2013) # available on amd64 diff --git a/profiles/arch/amd64/x32/use.mask b/profiles/arch/amd64/x32/use.mask new file mode 100644 index 000000000000..7692a1c2293c --- /dev/null +++ b/profiles/arch/amd64/x32/use.mask @@ -0,0 +1,7 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/use.mask,v 1.3 2014/03/29 22:07:07 mgorny Exp $ + +# Michał Górny <mgorny@gentoo.org> (26 Jan 2013) +# Unmask the x32 ABI. +-abi_x86_x32 |