From: Michał Górny Date: Sun, 1 Feb 2015 13:40:43 +0000 (+0000) Subject: Unhide CPU_FLAGS_X86 on {amd64,x86}-fbsd profiles, bug #538322 by Yuta SATOH. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20015e69675768e8351a4bfb479778d76a9a920c;p=gentoo.git Unhide CPU_FLAGS_X86 on {amd64,x86}-fbsd profiles, bug #538322 by Yuta SATOH. --- diff --git a/profiles/arch/amd64-fbsd/ChangeLog b/profiles/arch/amd64-fbsd/ChangeLog index 8301326fdcc7..9d44ed667497 100644 --- a/profiles/arch/amd64-fbsd/ChangeLog +++ b/profiles/arch/amd64-fbsd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86-fbsd profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.62 2015/01/28 21:31:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/ChangeLog,v 1.63 2015/02/01 13:40:43 mgorny Exp $ + + 01 Feb 2015; Michał Górny make.defaults: + Unhide CPU_FLAGS_X86 on {amd64,x86}-fbsd profiles, bug #538322 by Yuta SATOH. 28 Jan 2015; Michał Górny use.mask: Unmask CPU_FLAGS_X86. diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults index 8bbf0ad44e8b..eaeb1ff78bea 100644 --- a/profiles/arch/amd64-fbsd/make.defaults +++ b/profiles/arch/amd64-fbsd/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/make.defaults,v 1.15 2015/01/28 20:58:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/make.defaults,v 1.16 2015/02/01 13:40:43 mgorny Exp $ # System-wide defaults for the G/FBSD Portage system ARCH="amd64-fbsd" @@ -35,8 +35,8 @@ LIBDIR_amd64_fbsd="lib" MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32" SYMLINK_LIB="no" -# Unmask multilib ABIs use expands. -USE_EXPAND_HIDDEN="-ABI_X86" +# Unhide the x86-specific USE_EXPANDs. +USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86" # Michał Górny (01 Jul 2014) # Default to abi_x86_64 for packages that don't have it forced. diff --git a/profiles/arch/x86-fbsd/ChangeLog b/profiles/arch/x86-fbsd/ChangeLog index 892ea45a28b9..996120bab1bd 100644 --- a/profiles/arch/x86-fbsd/ChangeLog +++ b/profiles/arch/x86-fbsd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/x86-fbsd profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/ChangeLog,v 1.49 2015/01/28 21:33:57 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/ChangeLog,v 1.50 2015/02/01 13:40:43 mgorny Exp $ + + 01 Feb 2015; Michał Górny make.defaults: + Unhide CPU_FLAGS_X86 on {amd64,x86}-fbsd profiles, bug #538322 by Yuta SATOH. 28 Jan 2015; Michał Górny use.mask: Unmask CPU_FLAGS_X86. diff --git a/profiles/arch/x86-fbsd/make.defaults b/profiles/arch/x86-fbsd/make.defaults index f5eb907ca079..96f73e461144 100644 --- a/profiles/arch/x86-fbsd/make.defaults +++ b/profiles/arch/x86-fbsd/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation. +# Copyright 1999-2015 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/make.defaults,v 1.7 2014/07/01 07:49:58 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86-fbsd/make.defaults,v 1.8 2015/02/01 13:40:43 mgorny Exp $ # System-wide defaults for the G/FBSD Portage system ARCH="x86-fbsd" @@ -24,6 +24,9 @@ VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \ nv r128 radeon rendition s3 s3virge savage siliconmotion sis \ sisusb tga trident tseng via vmware" +# Unhide the CPU_FLAGS_X86 USE_EXPANDs. +USE_EXPAND_HIDDEN="-CPU_FLAGS_X86" + # Michał Górny (01 Jul 2014) # Default to abi_x86_32 for packages that don't have it forced. ABI_X86="32"