| 1 |
commit: 4176987526ba0af69b225d7ca1cc37f41462d81d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 21 14:23:04 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 12:27:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41769875 |
| 7 |
|
| 8 |
profiles: Inline features/32bit-userland |
| 9 |
|
| 10 |
profiles/arch/powerpc/ppc64/32ul/parent | 2 +- |
| 11 |
profiles/default/linux/sparc/13.0/parent | 2 +- |
| 12 |
profiles/features/32bit-userland/eapi | 1 - |
| 13 |
profiles/features/32bit-userland/parent | 1 - |
| 14 |
profiles/features/32bit-userland/profile.bashrc | 9 --------- |
| 15 |
.../linux/powerpc/ppc64}/32bit-userland/packages | 0 |
| 16 |
profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent | 2 +- |
| 17 |
7 files changed, 3 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/profiles/arch/powerpc/ppc64/32ul/parent b/profiles/arch/powerpc/ppc64/32ul/parent |
| 20 |
index feb4025..0cd1f96 100644 |
| 21 |
--- a/profiles/arch/powerpc/ppc64/32ul/parent |
| 22 |
+++ b/profiles/arch/powerpc/ppc64/32ul/parent |
| 23 |
@@ -1,3 +1,3 @@ |
| 24 |
-../../../../features/32bit-userland |
| 25 |
+../../../../features/multilib |
| 26 |
.. |
| 27 |
../../ppc32 |
| 28 |
|
| 29 |
diff --git a/profiles/default/linux/sparc/13.0/parent b/profiles/default/linux/sparc/13.0/parent |
| 30 |
index 222c2cf..483b027 100644 |
| 31 |
--- a/profiles/default/linux/sparc/13.0/parent |
| 32 |
+++ b/profiles/default/linux/sparc/13.0/parent |
| 33 |
@@ -1,3 +1,3 @@ |
| 34 |
.. |
| 35 |
../../../../releases/13.0 |
| 36 |
-../../../../features/32bit-userland |
| 37 |
+../../../../features/multilib |
| 38 |
|
| 39 |
diff --git a/profiles/features/32bit-userland/eapi b/profiles/features/32bit-userland/eapi |
| 40 |
deleted file mode 100644 |
| 41 |
index 7ed6ff8..00000000 |
| 42 |
--- a/profiles/features/32bit-userland/eapi |
| 43 |
+++ /dev/null |
| 44 |
@@ -1 +0,0 @@ |
| 45 |
-5 |
| 46 |
|
| 47 |
diff --git a/profiles/features/32bit-userland/parent b/profiles/features/32bit-userland/parent |
| 48 |
deleted file mode 100644 |
| 49 |
index ef64da6..00000000 |
| 50 |
--- a/profiles/features/32bit-userland/parent |
| 51 |
+++ /dev/null |
| 52 |
@@ -1 +0,0 @@ |
| 53 |
-../multilib |
| 54 |
|
| 55 |
diff --git a/profiles/features/32bit-userland/profile.bashrc b/profiles/features/32bit-userland/profile.bashrc |
| 56 |
deleted file mode 100644 |
| 57 |
index 9eebc76..00000000 |
| 58 |
--- a/profiles/features/32bit-userland/profile.bashrc |
| 59 |
+++ /dev/null |
| 60 |
@@ -1,9 +0,0 @@ |
| 61 |
-# Here we remove any ABI that isn't 32-bit. |
| 62 |
-case ${PROFILE_ARCH} in |
| 63 |
- mips64) |
| 64 |
- # This is for o32 (64-bit kernel, 32-bit userland) so we force -mabi=32 |
| 65 |
- export CHOST="mips-unknown-linux-gnu" |
| 66 |
- export CFLAGS="${CFLAGS/-mabi=*/-mabi=32}" |
| 67 |
- export CXXFLAGS="${CFLAGS}" |
| 68 |
- ;; |
| 69 |
-esac |
| 70 |
|
| 71 |
diff --git a/profiles/features/32bit-userland/packages b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages |
| 72 |
similarity index 100% |
| 73 |
rename from profiles/features/32bit-userland/packages |
| 74 |
rename to profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages |
| 75 |
|
| 76 |
diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent |
| 77 |
index 926c328..97dffb6 100644 |
| 78 |
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent |
| 79 |
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent |
| 80 |
@@ -1,2 +1,2 @@ |
| 81 |
.. |
| 82 |
-../../../../../features/32bit-userland |
| 83 |
+../../../../../features/multilib |
Archives