From f4d990471a19cb94e63b9e03ea6b351362397aeb Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Sep 2013 14:35:17 -0400 Subject: [PATCH] churn(profiles): Replace features/64bit-native with upstream. --- .../linux/amd64/10.0/no-multilib/parent | 2 +- .../features/64bit-native/make.defaults | 13 -- .../features/64bit-native/package.mask | 177 ------------------ .../features/64bit-native/package.use.mask | 7 - .../features/64bit-native/profile.bashrc | 18 -- .../profiles/features/64bit-native/use.force | 2 - .../profiles/features/64bit-native/use.mask | 25 --- 7 files changed, 1 insertion(+), 243 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/package.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/profile.bashrc delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.mask diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent index 521b28aab8..fa03b78cac 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent @@ -1,3 +1,3 @@ .. ../../../../../arch/amd64/no-multilib -../../../../../features/64bit-native +portage-stable:features/64bit-native diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/make.defaults deleted file mode 100644 index 6058a121a0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/make.defaults +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/make.defaults,v 1.2 2008/11/14 15:43:49 darkside Exp $ - -# We still need lib to be a symlink since LIBDIR is lib64 -SYMLINK_LIB="yes" - -USE="-gcc64" -STAGE1_USE="nptl nptlonly unicode" - -# Since we're doing a pure 64-bit, we want LIBDIR to be lib64 -LIBDIR_amd64="lib64" -LIBDIR_ppc64="lib64" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/package.mask deleted file mode 100644 index 4e31f1ab30..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/package.mask +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.30 2009/09/16 20:18:08 ulm Exp $ - -# AMD64 Team -# Mask packages that rely on amd64 multilib -app-accessibility/mbrola -app-accessibility/perlbox-voice -app-antivirus/bitdefender-console -app-antivirus/f-prot - -# ifc masked -sci-libs/acml ifc - -# Alexis Ballier (13 Aug 2009) -# Requires wine -media-sound/lmms vst diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/profile.bashrc deleted file mode 100644 index 71acdf820a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/profile.bashrc +++ /dev/null @@ -1,18 +0,0 @@ -# Here we remove any ABI that isn't native. -case ${ARCH} in - mips) - # Both n32 and n64 are 64-bit kernel and userland. - # n64 is 64-bit pointers/long - # n32 is 32-bit pointers/long - case ${USE} in - n32) - export CFLAGS="${CFLAGS/-mabi=*/-mabi=n32}" - export CXXFLAGS="${CFLAGS}" - ;; - n64) - export CFLAGS="${CFLAGS/-mabi=*/-mabi=64}" - export CXXFLAGS="${CFLAGS}" - ;; - esac - ;; -esac diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.force deleted file mode 100644 index 78a0ced5d8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.force +++ /dev/null @@ -1,2 +0,0 @@ -# Force disable multilib USE flag --multilib diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.mask deleted file mode 100644 index 5c306fc607..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/64bit-native/use.mask +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/use.mask,v 1.6 2009/09/15 18:23:00 ssuominen Exp $ - -# USE flags masked because providing packages require a 32-bit ABI - -# 2007/08/29 Christoph Mende -# app-accessibility/mbrola is x86 only -mbrola - -# 2006/05/04 Chris Gianelloni -# games-fps/quake3-teamarena is 32-bit -teamarena - -# 2007/08/24 Michael Marineau -# Xen HVM support requires building 32-bit binaries. -hvm - -# 2008/02/13 - Chris Gianelloni -# Mask multilib, since we cannot use it. -multilib - -# 2009/05/11 Doug Goldstein -# Mask 32bit since this will always require emulation packages -32bit