From 117008b7d354af926de31fc686e330f64f92d812 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 24 Feb 2007 15:15:51 +0000 Subject: [PATCH] Mask and force ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. --- profiles/ChangeLog | 9 ++++++++- profiles/base/use.force | 5 +++++ profiles/base/use.mask | 6 +++++- profiles/default-bsd/fbsd/use.force | 4 ++++ profiles/default-bsd/use.mask | 5 ++--- profiles/default-darwin/use.force | 3 +++ profiles/default-darwin/use.mask | 5 ++--- profiles/uclibc/use.force | 1 + profiles/uclibc/use.mask | 3 +++ 9 files changed, 33 insertions(+), 8 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 4141b6a3d415..048f09a687cc 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for profile directory # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.132 2007/02/24 11:27:33 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.133 2007/02/24 15:15:51 zmedico Exp $ + + 24 Feb 2007; Zac Medico + base/use.force, base/use.mask, default-bsd/use.mask, + default-bsd/fbsd/use.force, default-darwin/use.force, + default-darwin/use.mask, uclibc/use.force, uclibc/use.mask: + Mask and force ELIBC, KERNEL, and USERLAND flags that apply to specific + profiles. 24 Feb 2007; Christian Faulhammer use.local.desc: added kpoll and smp USE flags for dev-lang/erlang diff --git a/profiles/base/use.force b/profiles/base/use.force index e69de29bb2d1..01486e67e713 100644 --- a/profiles/base/use.force +++ b/profiles/base/use.force @@ -0,0 +1,5 @@ +# Force the GNU/Linux ELIBC, KERNEL, and USERLAND +# flags that apply to the majority of profiles. +elibc_glibc +kernel_linux +userland_GNU diff --git a/profiles/base/use.mask b/profiles/base/use.mask index e7c6b9a90ae4..07cb502a892b 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -81,13 +81,17 @@ infopipe # psyco only works on x86 psyco -# Mask the various *BSD libcs a part from the various subprofiles +# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. elibc_FreeBSD elibc_NetBSD elibc_OpenBSD elibc_Darwin elibc_DragonFly +elibc_uclibc +kernel_Darwin kernel_FreeBSD +userland_BSD +userland_Darwin # Diego Pettenò (6 Dec 2006) # Mask specific Apple drivers diff --git a/profiles/default-bsd/fbsd/use.force b/profiles/default-bsd/fbsd/use.force index 42189fac1ed1..d221d0ea5cd1 100644 --- a/profiles/default-bsd/fbsd/use.force +++ b/profiles/default-bsd/fbsd/use.force @@ -1 +1,5 @@ java5 + +# Force freebsd-specific variables +elibc_FreeBSD +kernel_FreeBSD diff --git a/profiles/default-bsd/use.mask b/profiles/default-bsd/use.mask index 797d25117fe1..ad40bba1c47d 100644 --- a/profiles/default-bsd/use.mask +++ b/profiles/default-bsd/use.mask @@ -1,6 +1,6 @@ # Copyright 2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.29 2007/01/04 21:49:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/use.mask,v 1.30 2007/02/24 15:15:51 zmedico Exp $ # Linux-dependant flags selinux @@ -59,11 +59,10 @@ ifp ipod # Mask extraneous elibc/kernel combinations +-userland_BSD elibc_glibc -elibc_uclibc kernel_linux userland_GNU -userland_Darwin # Mask Xorg-modular drivers that are Linux-specific input_devices_aiptek diff --git a/profiles/default-darwin/use.force b/profiles/default-darwin/use.force index e69de29bb2d1..7a82a7facee5 100644 --- a/profiles/default-darwin/use.force +++ b/profiles/default-darwin/use.force @@ -0,0 +1,3 @@ +elibc_Darwin +kernel_Darwin +userland_Darwin diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask index 358b2f7732ae..9b57892d79e2 100644 --- a/profiles/default-darwin/use.mask +++ b/profiles/default-darwin/use.mask @@ -58,11 +58,10 @@ fastcgi # Re-add Darwin libc -elibc_Darwin +-kernel_Darwin +-userland_Darwin # Mask extraneous elibc/kernel combinations elibc_glibc -elibc_uclibc kernel_linux -kernel_FreeBSD userland_GNU -userland_BSD diff --git a/profiles/uclibc/use.force b/profiles/uclibc/use.force index e69de29bb2d1..3904f12fc0b2 100644 --- a/profiles/uclibc/use.force +++ b/profiles/uclibc/use.force @@ -0,0 +1 @@ +elibc_uclibc diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask index 57f8c2a6f52b..f93b78e984d7 100644 --- a/profiles/uclibc/use.mask +++ b/profiles/uclibc/use.mask @@ -5,3 +5,6 @@ nis emul-linux-x86 -uclibc + +-elibc_uclibc +elibc_glibc -- 2.26.2