blueness 14/07/01 12:37:35 Modified: make.defaults use.force use.mask Log: Make linux/musl multilib aware, bug #515130
Revision Changes Path 1.6 profiles/hardened/linux/musl/amd64/make.defaults file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults?r1=1.5&r2=1.6 Index: make.defaults =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- make.defaults 9 Jun 2014 15:19:09 -0000 1.5 +++ make.defaults 1 Jul 2014 12:37:35 -0000 1.6 @@ -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/hardened/linux/musl/amd64/make.defaults,v 1.5 2014/06/09 15:19:09 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/make.defaults,v 1.6 2014/07/01 12:37:35 blueness Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" @@ -10,3 +10,12 @@ CXXFLAGS="${CFLAGS}" FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" + +# Anthony G. Basile <bluen...@gentoo.org> (01 Jul 2014) +# Multilib-related setup, bug #515130 +ABI="amd64" +DEFAULT_ABI="amd64" +MULTILIB_ABIS="amd64" +CHOST_amd64=${CHOST} +LIBDIR_amd64="lib" +IUSE_IMPLICIT="abi_x86_64" 1.3 profiles/hardened/linux/musl/amd64/use.force file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force?r1=1.2&r2=1.3 Index: use.force =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- use.force 9 Mar 2014 23:18:34 -0000 1.2 +++ use.force 1 Jul 2014 12:37:35 -0000 1.3 @@ -1,9 +1,7 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.2 2014/03/09 23:18:34 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.force,v 1.3 2014/07/01 12:37:35 blueness Exp $ -# Force the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 amd64 - -# Force the flag corresponding to the default ABI. abi_x86_64 1.3 profiles/hardened/linux/musl/amd64/use.mask file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask?r1=1.2&r2=1.3 Index: use.mask =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- use.mask 9 Mar 2014 23:18:34 -0000 1.2 +++ use.mask 1 Jul 2014 12:37:35 -0000 1.3 @@ -1,11 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.2 2014/03/09 23:18:34 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/use.mask,v 1.3 2014/07/01 12:37:35 blueness Exp $ -# Unmask the flag which corresponds to ARCH. +# Force the flag which corresponds to arch/abi, bug #515130 -amd64 - -# Unmask the multilib flags for this arch. -abi_x86_64 # unmask all SIMD assembler flags