From 78e518ed3aee64895a5d5e19aace5089c676002d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 18 Jan 2007 18:15:08 +0000 Subject: [PATCH] Removing the abomination multilib profile --- profiles/default-linux/sparc/ChangeLog | 11 +++- .../dev/multilib/64bitdefault/make.defaults | 6 -- .../dev/multilib/64bitdefault/package.mask | 33 ---------- .../sparc64/dev/multilib/64bitdefault/parent | 1 - .../sparc/sparc64/dev/multilib/README | 63 ------------------- .../sparc/sparc64/dev/multilib/make.defaults | 13 ---- .../sparc/sparc64/dev/multilib/package.mask | 24 ------- .../sparc/sparc64/dev/multilib/packages | 14 ----- .../sparc/sparc64/dev/multilib/parent | 1 - .../sparc/sparc64/dev/multilib/use.mask | 6 -- .../sparc/sparc64/dev/multilib/virtuals | 5 -- 11 files changed, 10 insertions(+), 167 deletions(-) delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/parent delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/README delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/package.mask delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/packages delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/parent delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/use.mask delete mode 100644 profiles/default-linux/sparc/sparc64/dev/multilib/virtuals diff --git a/profiles/default-linux/sparc/ChangeLog b/profiles/default-linux/sparc/ChangeLog index 1cafd9109d3c..683f0b4c672a 100644 --- a/profiles/default-linux/sparc/ChangeLog +++ b/profiles/default-linux/sparc/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sparc profile # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.17 2007/01/18 12:54:02 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/ChangeLog,v 1.18 2007/01/18 18:15:08 gustavoz Exp $ + + 18 Jan 2007; Gustavo Zacarias + -sparc64/dev/multilib/64bitdefault/make.defaults, + -sparc64/dev/multilib/64bitdefault/package.mask, + -sparc64/dev/multilib/64bitdefault/parent, -sparc64/dev/multilib/README, + -sparc64/dev/multilib/make.defaults, -sparc64/dev/multilib/package.mask, + -sparc64/dev/multilib/packages, -sparc64/dev/multilib/parent, + -sparc64/dev/multilib/use.mask, -sparc64/dev/multilib/virtuals: + Removing the abomination multilib profile 18 Jan 2007; Gustavo Zacarias sparc64/2006.0/2.4/packages, sparc64/2006.0/packages, diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults deleted file mode 100644 index fc9ab71951b2..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/make.defaults,v 1.3 2005/12/01 14:06:16 gustavoz Exp $ - -CHOST="sparc64-unknown-linux-gnu" -DEFAULT_ABI="sparc64" diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask b/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask deleted file mode 100644 index aa147a81bb99..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/64bitdefault/package.mask,v 1.4 2005/12/01 14:06:16 gustavoz Exp $ - -# Jeremy Huddleston -# mask out multilib unfriendly versions. Newer ones should install to & look -# in proper $(get_libdir) -=sys-devel/gcc-config-1.3.11' '>=sys-apps/portage-2.0.51-r9' - -Delete the /usr/sparc64-unknown-linux-gnu symlink hackery: -# rm /usr/sparc64-unknown-linux-gnu - -Unmerge the kernel compiler as you don't need it any more -# emerge unmerge gcc-sparc64 - -Switch to profile: -# rm /etc/make.profile -# ln -s /usr/portage/profiles/default-linux/sparc/sparc64/dev/multilib /etc/make.profile - -Change CHOST in /etc/make.conf to sparc64-unknown-linux-gnu (or delete it since -the profile sets it for us): -# nano -w /etc/make.conf - -Get an updated baselayout -# emerge -v baselayout - -Get a sparc64 binutils: -# CC="sparc-unknown-linux-gnu-gcc" emerge -v binutils - -Use binutils-config to choose sparc64-* binutils: -# binutils-config -l -# binutils-config -# . /etc/profile - -Get a stage1 sparc64 gcc: -# CC="sparc-unknown-linux-gnu-gcc" USE="build static" GCC_MAKE_TARGET="all" emerge -v gcc - -Remove sparc32 gcc compiler and binutils from your system -# emerge unmerge \=sys-devel/gcc- \=sys-devel/binutils- -# rm /etc/env.d/gcc/config-sparc-unknown-linux-gnu /etc/env.d/05gcc-sparc-unknown-linux-gnu /etc/env.d/binutils/binutils/config-sparc-unknown-linux-gnu -# rm /etc/env.d/binutils/config-sparc-unknown-linux-gnu - -Use gcc-config to set your gcc -Choose the sparc64-unknown-linux-gnu one you just emerged -# gcc-config -l -# gcc-config -# . /etc/profile - -Use the stage1 gcc to build bootstrap multilib glibc -# USE="-nptl" CBUILD="sparc-unknown-linux-gnu" emerge -v glibc - -Now, finally emerge your multilib sandbox, full glibc and gcc -# emerge -v portage gcc glibc - -Now unfortunately a bunch of .las are now lying around pointing to incorrect places... Here's a kludge: -find /usr/lib /usr/kde/*/lib /usr/qt/*/lib -name '*.la' -exec \ - sed -i -e 's:usr/lib/gcc\(-lib\)?/sparc-unknown-linux-gnu:usr/lib/gcc/sparc64-unknown-linux-gnu:g' \ - -e 's:/lib\(ffi\|g2c\|objc\|stdc++\|supc++\):/32/lib\1:g' \ - -e 's:/32/32/:/32/:g' \ - {} \; - -Next, get rid of the /usr/lib/gcc/sparc64-unknown-linux-gnu//*.la files. They will confuse libtool. See bug #75420 for more info on this. diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults b/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults deleted file mode 100644 index 8c5dac1fc50e..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/make.defaults,v 1.4 2005/12/01 14:06:16 gustavoz Exp $ - -MULTILIB_ABIS="sparc32 sparc64" - -CFLAGS_sparc64="-m64" -LDFLAGS_sparc64="-m elf64_sparc" -CHOST_sparc64="sparc64-unknown-linux-gnu" -CTARGET_ALIASES_sparc64="sparc64-linux" -CDEFINE_sparc64="__arch64__" -LIBDIR_sparc64="lib64" - diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask b/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask deleted file mode 100644 index 44c2a7029eed..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/package.mask,v 1.6 2005/12/01 14:06:16 gustavoz Exp $ - -# Jeremy Huddleston 2005.03.06 -# sys-devel/gcc brings in our 64bit compiler -sys-devel/gcc-sparc64 - -# Jeremy Huddleston 2005.03.08 -# Older perl versions don't set the correct archlib path for multilib -# profiles where CHOST != $(get_abi_CHOST) - 2005.03.08 -# Older postgresql versions use sparc64 ld without the $(get_abi_LDFLAGS) - 2005.08.23 -# These old versions don't work when the default toolchain target is not -# the desired target -=sys-devel/gcc-config-1* -=sys-devel/binutils-config-1* diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/packages b/profiles/default-linux/sparc/sparc64/dev/multilib/packages deleted file mode 100644 index 4b8570bd79ad..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/packages +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/packages,v 1.5 2005/12/01 14:06:16 gustavoz Exp $ - -# sys-devel/gcc brings in our 64bit compiler --*sys-devel/gcc-sparc64 - -# Force toolchain versions that have been tested to work and are multilib aware -*>=sys-apps/portage-2.0.51-r13 -*>=sys-devel/binutils-2.15.92.0.2-r2 -*>=sys-devel/gcc-3.4.3-r1 -*>=sys-libs/glibc-2.3.4.20050125-r1 -*app-admin/eselect-compiler ->=sys-devel/distcc-2.18.3-r4 diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/parent b/profiles/default-linux/sparc/sparc64/dev/multilib/parent deleted file mode 100644 index 2d649e2d7226..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/parent +++ /dev/null @@ -1 +0,0 @@ -../../2006.0 diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/use.mask b/profiles/default-linux/sparc/sparc64/dev/multilib/use.mask deleted file mode 100644 index f36d68b2bb44..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/use.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/use.mask,v 1.2 2005/12/02 20:25:37 eradicator Exp $ - -freetts -java diff --git a/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals b/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals deleted file mode 100644 index 9104b354949f..000000000000 --- a/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/dev/multilib/virtuals,v 1.2 2005/03/28 01:39:07 wolf31o2 Exp $ - -virtual/linux-sources sys-kernel/gentoo-sources -- 2.26.2