diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-01-21 15:23:04 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-02-01 13:27:09 +0100 |
| commit | 4176987526ba0af69b225d7ca1cc37f41462d81d (patch) | |
| tree | 493ef0ec07d38ca97731931596011ca024e3c8ce /profiles | |
| parent | profiles: Inline features/multilib/lib32 (diff) | |
| download | gentoo-4176987526ba0af69b225d7ca1cc37f41462d81d.tar.gz gentoo-4176987526ba0af69b225d7ca1cc37f41462d81d.tar.bz2 gentoo-4176987526ba0af69b225d7ca1cc37f41462d81d.zip | |
profiles: Inline features/32bit-userland
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/powerpc/ppc64/32ul/parent | 2 | ||||
| -rw-r--r-- | profiles/default/linux/sparc/13.0/parent | 2 | ||||
| -rw-r--r-- | profiles/features/32bit-userland/eapi | 1 | ||||
| -rw-r--r-- | profiles/features/32bit-userland/parent | 1 | ||||
| -rw-r--r-- | profiles/features/32bit-userland/profile.bashrc | 9 | ||||
| -rw-r--r-- | profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages (renamed from profiles/features/32bit-userland/packages) | 0 | ||||
| -rw-r--r-- | 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 feb40253cb27..0cd1f96e3181 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 222c2cf56930..483b02751681 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 7ed6ff82de6b..000000000000 --- 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 ef64da6e1d20..000000000000 --- 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 9eebc767690d..000000000000 --- 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 index 8f4f21f838c4..8f4f21f838c4 100644 --- a/profiles/features/32bit-userland/packages +++ b/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 926c3281b862..97dffb64c4d1 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 |