commit: 4176987526ba0af69b225d7ca1cc37f41462d81d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 14:23:04 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 12:27:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41769875
profiles: Inline features/32bit-userland
profiles/arch/powerpc/ppc64/32ul/parent | 2 +-
profiles/default/linux/sparc/13.0/parent | 2 +-
profiles/features/32bit-userland/eapi | 1 -
profiles/features/32bit-userland/parent | 1 -
profiles/features/32bit-userland/profile.bashrc | 9 ---------
.../linux/powerpc/ppc64}/32bit-userland/packages | 0
profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent | 2 +-
7 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/profiles/arch/powerpc/ppc64/32ul/parent
b/profiles/arch/powerpc/ppc64/32ul/parent
index feb4025..0cd1f96 100644
--- a/profiles/arch/powerpc/ppc64/32ul/parent
+++ b/profiles/arch/powerpc/ppc64/32ul/parent
@@ -1,3 +1,3 @@
-../../../../features/32bit-userland
+../../../../features/multilib
..
../../ppc32
diff --git a/profiles/default/linux/sparc/13.0/parent
b/profiles/default/linux/sparc/13.0/parent
index 222c2cf..483b027 100644
--- a/profiles/default/linux/sparc/13.0/parent
+++ b/profiles/default/linux/sparc/13.0/parent
@@ -1,3 +1,3 @@
..
../../../../releases/13.0
-../../../../features/32bit-userland
+../../../../features/multilib
diff --git a/profiles/features/32bit-userland/eapi
b/profiles/features/32bit-userland/eapi
deleted file mode 100644
index 7ed6ff8..00000000
--- a/profiles/features/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/32bit-userland/parent
b/profiles/features/32bit-userland/parent
deleted file mode 100644
index ef64da6..00000000
--- a/profiles/features/32bit-userland/parent
+++ /dev/null
@@ -1 +0,0 @@
-../multilib
diff --git a/profiles/features/32bit-userland/profile.bashrc
b/profiles/features/32bit-userland/profile.bashrc
deleted file mode 100644
index 9eebc76..00000000
--- a/profiles/features/32bit-userland/profile.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Here we remove any ABI that isn't 32-bit.
-case ${PROFILE_ARCH} in
- mips64)
- # This is for o32 (64-bit kernel, 32-bit userland) so we force
-mabi=32
- export CHOST="mips-unknown-linux-gnu"
- export CFLAGS="${CFLAGS/-mabi=*/-mabi=32}"
- export CXXFLAGS="${CFLAGS}"
- ;;
-esac
diff --git a/profiles/features/32bit-userland/packages
b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
similarity index 100%
rename from profiles/features/32bit-userland/packages
rename to profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
index 926c328..97dffb6 100644
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
@@ -1,2 +1,2 @@
..
-../../../../../features/32bit-userland
+../../../../../features/multilib
