From 4be0a3bf8413ecd3191787063a26724da29af3bb Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 24 Dec 2004 09:45:00 +0000 Subject: Removed CXXFLAGS_${ABI} as it's not needed. Added a note to point someone curious to the multilib bug. --- .../sparc/sparc64-multilib/dev/make.defaults | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'profiles') diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults index 99ec83a6edc4..e81fae5cdea8 100644 --- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults +++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.8 2004/12/23 08:32:17 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.9 2004/12/24 09:45:00 eradicator Exp $ ARCH="sparc" ACCEPT_KEYWORDS="${ARCH}" @@ -20,30 +20,22 @@ GRP_STAGE23_USE="berkdb gpm ipv6 -java multislot multilib ncurses nls -nptl pam # Sane, minimal USE settings USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups fortran f77 fbcon gif jpeg nls png tiff truetype usb xpm xrandr xv" -# This isn't implemented in portage. +# This isn't implemented in portage/toolchain, yet. See +# http://bugs.gentoo.org/show_bug.cgi?id=75420 + # MULTILIB_ABIS lists all the ABIS you want to build for when # you emerge a package. The libs that get installed will be for # all of these ABIs, but the bins will be for ${DEFAULT_ABI}. MULTILIB_ABIS="sparc32 sparc64" -DEFAULT_ABI="sparc64" +DEFAULT_ABI="sparc32" ARCH_WRAPPER_sparc64="sparc64" ASFLAGS_sparc64="-64 -no-undeclared-regs" CFLAGS_sparc64="-m64" -CXXFLAGS_sparc64="${CFLAGS_sparc64}" LIBDIR_sparc64="lib64" ARCH_WRAPPER_sparc32="sparc32" -ASFLAGS_sparc64="-32" +ASFLAGS_sparc32="-32" CFLAGS_sparc32="-m32" -CXXFLAGS_sparc32="${CFLAGS_sparc32}" LIBDIR_sparc32="lib" - -# This will get removed once the per-abi functionality is in portage: -CONF_LIBDIR="lib64" -CONF_MULTILIBDIR="lib" -ARCH_WRAPPER="sparc32" -CHOST32="sparc-unknown-linux-gnu" -CC32="gcc32" -CPP32="g++32" -- cgit v1.2.3-65-gdbad