From e572fa22cdd4753785d42211f68d5ff1b469edf9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Dec 2011 19:21:37 +0000 Subject: [PATCH] merge standard mips LIBDIR settings, and add amd64 x32 abi settings, and sort the resulting mess! --- profiles/features/multilib/make.defaults | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults index 9c230f885946..d7109b1cceba 100644 --- a/profiles/features/multilib/make.defaults +++ b/profiles/features/multilib/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.7 2011/11/17 01:14:26 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.8 2011/12/07 19:21:37 vapier Exp $ # Jorge Manuel B. S. Vicetto (16 Nov 2011) # Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value @@ -15,13 +15,19 @@ MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev # 64-bit LIBDIR LIBDIR_amd64="lib64" LIBDIR_amd64_fbsd="lib64" +LIBDIR_n64="lib64" # MIPS n64 LIBDIR_ppc64="lib64" -LIBDIR_sparc64="lib64" LIBDIR_s390x="lib64" +LIBDIR_sparc64="lib64" # 32-bit LIBDIR -LIBDIR_ppc="lib" LIBDIR_x86="lib" LIBDIR_x86_fbsd="lib" -LIBDIR_sparc32="lib" +LIBDIR_o32="lib" # MIPS o32 +LIBDIR_ppc="lib" LIBDIR_s390="lib" +LIBDIR_sparc32="lib" + +# Somewhere in-between! +LIBDIR_x32="libx32" # x86-64 x32 +LIBDIR_n32="lib32" # MIPS n32 -- 2.26.2