From 448d8cd7352323d6278bb5f976d47536fb328c1d Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Tue, 1 Jul 2014 07:47:50 +0000 Subject: Update default ABI_X86 in x32 profile. --- profiles/arch/amd64/ChangeLog | 5 ++++- profiles/arch/amd64/x32/make.defaults | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'profiles') diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog index aebcfe044c59..c2416d27d9fa 100644 --- a/profiles/arch/amd64/ChangeLog +++ b/profiles/arch/amd64/ChangeLog @@ -1,6 +1,9 @@ # 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.266 2014/06/29 18:35:33 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.267 2014/07/01 07:47:50 mgorny Exp $ + + 01 Jul 2014; Michał Górny x32/make.defaults: + Update default ABI_X86 in x32 profile. 29 Jun 2014; Andreas K. Huettel package.use.mask: Mask use-flag firebird and package dev-db/firebird for bug 460780 diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults index 4a9c2906b182..240539b61663 100644 --- a/profiles/arch/amd64/x32/make.defaults +++ b/profiles/arch/amd64/x32/make.defaults @@ -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/x32/make.defaults,v 1.4 2014/06/25 12:05:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/make.defaults,v 1.5 2014/07/01 07:47:50 mgorny Exp $ DEFAULT_ABI="x32" ABI="x32" @@ -10,6 +10,10 @@ FEATURES="collision-protect multilib-strict" SYMLINK_LIB="no" +# Michał Górny (01 Jul 2014) +# Default to abi_x86_x32 for packages that don't have it forced. +ABI_X86="x32" + # Michał Górny (25 Jun 2014) # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied # by non-multilib ebuilds when non-native ABIs are disabled. -- cgit v1.2.3-65-gdbad