mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-03 11:32:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

churn(profiles): Replace features/multilib with upstream.

Browse Source
This commit is contained in:
Michael Marineau 2013-09-13 14:41:31 -04:00
parent f4d990471a
commit d7190b3fef
8 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent vendored
View File

@ -1,2 +1,2 @@
../base
../../features/multilib/lib32
portage-stable:features/multilib/lib32

2
sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent vendored
View File

@ -1,3 +1,3 @@
..
# Need to clobber amd64 pulling in lib32 on us.
../../../features/multilib
portage-stable:features/multilib

13
sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/make.defaults vendored
View File

@ -1,13 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/lib32/make.defaults,v 1.2 2011/03/21 04:39:31 vapier Exp $
# Let baselayout create the lib symlink.
SYMLINK_LIB="yes"
# 32-bit LIBDIR
LIBDIR_ppc="lib32"
LIBDIR_x86="lib32"
LIBDIR_x86_fbsd="lib32"
LIBDIR_sparc32="lib32"
LIBDIR_s390="lib32"

1
sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/lib32/parent vendored
View File

@ -1 +0,0 @@
..

33
sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/make.defaults vendored
View File

@ -1,33 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/make.defaults,v 1.8 2011/12/07 19:21:37 vapier Exp $
# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (16 Nov 2011)
# Rename STAGE1_USE to BOOTSTRAP_USE and stack it to the parent value
# This is so we build with multilib from the start
BOOTSTRAP_USE="${BOOTSTRAP_USE} multilib"
# FEATURES="multilib-strict" specific settings.
MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib"
MULTILIB_STRICT_DENY="64-bit.*shared object"
MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev)"
# 64-bit LIBDIR
LIBDIR_amd64="lib64"
LIBDIR_amd64_fbsd="lib64"
LIBDIR_n64="lib64" # MIPS n64
LIBDIR_ppc64="lib64"
LIBDIR_s390x="lib64"
LIBDIR_sparc64="lib64"
# 32-bit LIBDIR
LIBDIR_x86="lib"
LIBDIR_x86_fbsd="lib"
LIBDIR_o32="lib" # MIPS o32
LIBDIR_ppc="lib"
LIBDIR_s390="lib"
LIBDIR_sparc32="lib"
# Somewhere in-between!
LIBDIR_x32="libx32" # x86-64 x32
LIBDIR_n32="lib32" # MIPS n32

8
sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/package.use.mask vendored
View File

@ -1,8 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/package.use.mask,v 1.1 2012/09/20 11:42:57 chithanh Exp $
# Matt Turner <mattst88@gentoo.org> (19 Sep 2012)
# multilib requires 32-bit libGL provided by emul-linux-x86-opengl
# but also collides with 32-bit libGLU installed by emul-linux-x86-opengl
media-libs/glu multilib

2
sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.force vendored
View File

@ -1,2 +0,0 @@
# Force enable multilib USE flag
multilib

9
sdk_container/src/third_party/coreos-overlay/profiles/features/multilib/use.mask vendored
View File

@ -1,9 +0,0 @@
# Copyright 2004-2008 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
# $Header: /var/cvsroot/gentoo-x86/profiles/features/multilib/use.mask,v 1.1 2008/04/01 17:41:09 wolf31o2 Exp $
# SECTION: Unmask
# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
# Unmask multilib, since we need to use it.
-multilib