From: Ruud Koolen Date: Sat, 3 Jan 2015 03:32:53 +0000 (+0000) Subject: profiles/prefix: Switched linux-standalone profiles to the same multilib settings... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8afa67af00baefe5cdc0cac3285f37d86775eb5a;p=gentoo.git profiles/prefix: Switched linux-standalone profiles to the same multilib settings as default. --- diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog index 3c90a19d08be..942a3989d8de 100644 --- a/profiles/prefix/ChangeLog +++ b/profiles/prefix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for profiles/prefix # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.442 2014/12/28 23:19:48 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.443 2015/01/03 03:32:52 redlizard Exp $ + + 03 Jan 2015; Ruud Koolen + linux-standalone/amd64/make.defaults, linux-standalone/x86/make.defaults: + Switched linux-standalone profiles to the same multilib settings as default. 28 Dec 2014; Christoph Junghans darwin/macos/arch/x64/package.use.mask: diff --git a/profiles/prefix/linux-standalone/amd64/make.defaults b/profiles/prefix/linux-standalone/amd64/make.defaults index f7894193fb47..34ebca3e12a5 100644 --- a/profiles/prefix/linux-standalone/amd64/make.defaults +++ b/profiles/prefix/linux-standalone/amd64/make.defaults @@ -1,15 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux-standalone/amd64/make.defaults,v 1.1 2014/12/15 20:58:21 redlizard Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux-standalone/amd64/make.defaults,v 1.2 2015/01/03 03:32:53 redlizard Exp $ ARCH="amd64" CHOST="x86_64-pc-linux-gnu" # The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix. ACCEPT_KEYWORDS="-amd64 ~amd64-linux" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="amd64" -DEFAULT_ABI="amd64" -ABI="amd64" -IUSE_IMPLICIT="abi_x86_64" -LIBDIR_amd64="lib" diff --git a/profiles/prefix/linux-standalone/x86/make.defaults b/profiles/prefix/linux-standalone/x86/make.defaults index 36d623a0ee79..368cb526ae0e 100644 --- a/profiles/prefix/linux-standalone/x86/make.defaults +++ b/profiles/prefix/linux-standalone/x86/make.defaults @@ -1,15 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux-standalone/x86/make.defaults,v 1.1 2014/12/15 20:58:21 redlizard Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux-standalone/x86/make.defaults,v 1.2 2015/01/03 03:32:53 redlizard Exp $ ARCH="x86" CHOST="i686-pc-linux-gnu" # The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix. ACCEPT_KEYWORDS="-x86 ~x86-linux" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="x86" -DEFAULT_ABI="x86" -ABI="x86" -IUSE_IMPLICIT="abi_x86_32" -LIBDIR_x86="lib"