* [gentoo-commits] proj/hardened-dev:profiles commit in: profiles/default/linux/mips/13.0/mipsel/multilib/o32/, ...
@ 2014-09-21 22:03 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2014-09-21 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 4e019d6a1bf924719be0fb6cf5498f905f4e4834
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 21 22:03:53 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Sep 21 22:03:53 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=4e019d6a
Restructure mips profiles
---
profiles/arch/mips/make.defaults | 10 ----------
profiles/arch/mips/mips64/make.defaults | 2 --
profiles/arch/mips/mips64/n32/use.mask | 2 --
profiles/arch/mips/mips64/n64/use.mask | 2 --
profiles/arch/mips/mips64/use.force | 7 -------
profiles/arch/mips/mips64/use.mask | 7 -------
profiles/arch/mips/mipsel/mips64el/n32/use.mask | 2 --
profiles/arch/mips/mipsel/mips64el/n64/use.mask | 2 --
profiles/arch/mips/mipsel/mips64el/use.force | 7 -------
profiles/arch/mips/mipsel/mips64el/use.mask | 7 -------
profiles/arch/mips/mipsel/{ => o32}/eapi | 0
profiles/arch/mips/mipsel/{ => o32}/make.defaults | 7 +++++++
profiles/arch/mips/mipsel/o32/parent | 1 +
profiles/arch/mips/{mipsel => o32}/eapi | 0
profiles/arch/mips/{mipsel => o32}/make.defaults | 11 +++++++++--
profiles/arch/mips/o32/parent | 1 +
profiles/arch/mips/use.force | 1 -
profiles/arch/mips/use.mask | 1 -
.../linux/mips/13.0/mipsel/multilib/o32}/eapi | 0
profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent | 2 ++
.../linux/mips/13.0/mipsel/o32/desktop}/eapi | 0
profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent | 2 ++
.../linux/mips/13.0/mipsel/o32/developer}/eapi | 0
profiles/default/linux/mips/13.0/mipsel/o32/developer/parent | 2 ++
.../mips/mipsel => default/linux/mips/13.0/mipsel/o32}/eapi | 0
profiles/default/linux/mips/13.0/mipsel/o32/parent | 2 ++
.../mips/mipsel => default/linux/mips/13.0/multilib/o32}/eapi | 0
profiles/default/linux/mips/13.0/multilib/o32/parent | 2 ++
.../mips/mipsel => default/linux/mips/13.0/o32/desktop}/eapi | 0
profiles/default/linux/mips/13.0/o32/desktop/parent | 2 ++
.../mipsel => default/linux/mips/13.0/o32/developer}/eapi | 0
profiles/default/linux/mips/13.0/o32/developer/parent | 2 ++
.../{arch/mips/mipsel => default/linux/mips/13.0/o32}/eapi | 0
profiles/default/linux/mips/13.0/o32/parent | 2 ++
profiles/profiles.desc | 8 ++++----
35 files changed, 38 insertions(+), 56 deletions(-)
diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
index 6d30366..80e7725 100644
--- a/profiles/arch/mips/make.defaults
+++ b/profiles/arch/mips/make.defaults
@@ -13,20 +13,10 @@ PROFILE_ARCH="mips"
USE="-fortran -openmp"
-CHOST="mips-unknown-linux-gnu"
-CHOST_o32="mips-unknown-linux-gnu"
-
LIBDIR_o32="lib"
LIBDIR_n32="lib32"
LIBDIR_n64="lib64"
-ABI="o32"
-DEFAULT_ABI="o32"
-MULTILIB_ABIS="o32"
-
-ABI_MIPS="o32"
-IUSE_IMPLICIT="abi_mips_o32"
-
# 2010/12/06 - Matt Turner <mattst88@gentoo.org>
# Probably missing a bunch for various SGI systems.
ALSA_CARDS="au1x00"
diff --git a/profiles/arch/mips/mips64/make.defaults b/profiles/arch/mips/mips64/make.defaults
index 528d069..ec1c965 100644
--- a/profiles/arch/mips/mips64/make.defaults
+++ b/profiles/arch/mips/mips64/make.defaults
@@ -5,5 +5,3 @@
PROFILE_ARCH="mips64"
CHOST="mips64-unknown-linux-gnu"
-
-IUSE_IMPLICIT="-abi_mips_o32"
diff --git a/profiles/arch/mips/mips64/n32/use.mask b/profiles/arch/mips/mips64/n32/use.mask
index 426858c..d34dd89 100644
--- a/profiles/arch/mips/mips64/n32/use.mask
+++ b/profiles/arch/mips/mips64/n32/use.mask
@@ -2,6 +2,4 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/n32/use.mask,v 1.1 2014/06/30 15:16:16 mgorny Exp $
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
-abi_mips_n32
diff --git a/profiles/arch/mips/mips64/n64/use.mask b/profiles/arch/mips/mips64/n64/use.mask
index edf67b1..ec7683b 100644
--- a/profiles/arch/mips/mips64/n64/use.mask
+++ b/profiles/arch/mips/mips64/n64/use.mask
@@ -2,6 +2,4 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/n64/use.mask,v 1.1 2014/06/30 15:16:17 mgorny Exp $
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
-abi_mips_n64
diff --git a/profiles/arch/mips/mips64/use.force b/profiles/arch/mips/mips64/use.force
deleted file mode 100644
index 51b0dbb..0000000
--- a/profiles/arch/mips/mips64/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2008-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/use.force,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unforce o32 back for mips64 subprofiles.
--abi_mips_o32
diff --git a/profiles/arch/mips/mips64/use.mask b/profiles/arch/mips/mips64/use.mask
deleted file mode 100644
index 1f7e8cd..0000000
--- a/profiles/arch/mips/mips64/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/use.mask,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Mask o32 back for mips64 subprofiles.
-abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/use.mask b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
index 64a57da..c6fa467 100644
--- a/profiles/arch/mips/mipsel/mips64el/n32/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
@@ -2,6 +2,4 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/n32/use.mask,v 1.1 2014/06/30 15:16:17 mgorny Exp $
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
-abi_mips_n32
diff --git a/profiles/arch/mips/mipsel/mips64el/n64/use.mask b/profiles/arch/mips/mipsel/mips64el/n64/use.mask
index b846477..f337701 100644
--- a/profiles/arch/mips/mipsel/mips64el/n64/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n64/use.mask
@@ -2,6 +2,4 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/n64/use.mask,v 1.1 2014/06/30 15:16:17 mgorny Exp $
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
-abi_mips_n64
diff --git a/profiles/arch/mips/mipsel/mips64el/use.force b/profiles/arch/mips/mipsel/mips64el/use.force
deleted file mode 100644
index 2212cda..0000000
--- a/profiles/arch/mips/mipsel/mips64el/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2008-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/use.force,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unforce o32 back for mips64 subprofiles.
--abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/mips64el/use.mask b/profiles/arch/mips/mipsel/mips64el/use.mask
deleted file mode 100644
index e4f0841..0000000
--- a/profiles/arch/mips/mipsel/mips64el/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/use.mask,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Mask o32 back for mips64el subprofiles.
-abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/arch/mips/mipsel/o32/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/arch/mips/mipsel/o32/eapi
diff --git a/profiles/arch/mips/mipsel/make.defaults b/profiles/arch/mips/mipsel/o32/make.defaults
similarity index 77%
copy from profiles/arch/mips/mipsel/make.defaults
copy to profiles/arch/mips/mipsel/o32/make.defaults
index e9bbec3..9434ae5 100644
--- a/profiles/arch/mips/mipsel/make.defaults
+++ b/profiles/arch/mips/mipsel/o32/make.defaults
@@ -6,3 +6,10 @@ PROFILE_ARCH="mipsel"
CHOST="mipsel-unknown-linux-gnu"
CHOST_o32="mipsel-unknown-linux-gnu"
+
+ABI="o32"
+DEFAULT_ABI="o32"
+MULTILIB_ABIS="o32"
+
+ABI_MIPS="o32"
+IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/arch/mips/mipsel/o32/parent b/profiles/arch/mips/mipsel/o32/parent
new file mode 100644
index 0000000..f3229c5
--- /dev/null
+++ b/profiles/arch/mips/mipsel/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/arch/mips/o32/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/arch/mips/o32/eapi
diff --git a/profiles/arch/mips/mipsel/make.defaults b/profiles/arch/mips/o32/make.defaults
similarity index 60%
rename from profiles/arch/mips/mipsel/make.defaults
rename to profiles/arch/mips/o32/make.defaults
index e9bbec3..a951b36 100644
--- a/profiles/arch/mips/mipsel/make.defaults
+++ b/profiles/arch/mips/o32/make.defaults
@@ -4,5 +4,12 @@
PROFILE_ARCH="mipsel"
-CHOST="mipsel-unknown-linux-gnu"
-CHOST_o32="mipsel-unknown-linux-gnu"
+CHOST="mips-unknown-linux-gnu"
+CHOST_o32="mips-unknown-linux-gnu"
+
+ABI="o32"
+DEFAULT_ABI="o32"
+MULTILIB_ABIS="o32"
+
+ABI_MIPS="o32"
+IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/arch/mips/o32/parent b/profiles/arch/mips/o32/parent
new file mode 100644
index 0000000..f3229c5
--- /dev/null
+++ b/profiles/arch/mips/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/use.force b/profiles/arch/mips/use.force
index 890f1e4..d70092d 100644
--- a/profiles/arch/mips/use.force
+++ b/profiles/arch/mips/use.force
@@ -4,4 +4,3 @@
# Force the flag which corresponds to ARCH.
mips
-abi_mips_o32
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 748428c..0dba2bd 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -4,7 +4,6 @@
# Unmask the flag which corresponds to ARCH.
-mips
--abi_mips_o32
# Markos Chandras <hwoarang@gentoo.org>
# app-arch/lz4 does not seem to build on MIPS
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/mipsel/multilib/o32/eapi
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent
new file mode 100644
index 0000000..5fe2ba6
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../../arch/mips/mipsel/mips64el/multilib/o32
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/mipsel/o32/desktop/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/mipsel/o32/desktop/eapi
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent b/profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent
new file mode 100644
index 0000000..fae96e8
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/o32/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/mipsel/o32/developer/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/mipsel/o32/developer/eapi
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/developer/parent b/profiles/default/linux/mips/13.0/mipsel/o32/developer/parent
new file mode 100644
index 0000000..4bb06e4
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/o32/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/developer
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/mipsel/o32/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/mipsel/o32/eapi
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/parent b/profiles/default/linux/mips/13.0/mipsel/o32/parent
new file mode 100644
index 0000000..f4b62c6
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/multilib/o32/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/multilib/o32/eapi
diff --git a/profiles/default/linux/mips/13.0/multilib/o32/parent b/profiles/default/linux/mips/13.0/multilib/o32/parent
new file mode 100644
index 0000000..19367df
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/multilib/o32/parent
@@ -0,0 +1,2 @@
+../..
+../../../../../../arch/mips/mips64/multilib/o32
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/o32/desktop/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/o32/desktop/eapi
diff --git a/profiles/default/linux/mips/13.0/o32/desktop/parent b/profiles/default/linux/mips/13.0/o32/desktop/parent
new file mode 100644
index 0000000..db8ce08
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/o32/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/o32/developer/eapi
similarity index 100%
copy from profiles/arch/mips/mipsel/eapi
copy to profiles/default/linux/mips/13.0/o32/developer/eapi
diff --git a/profiles/default/linux/mips/13.0/o32/developer/parent b/profiles/default/linux/mips/13.0/o32/developer/parent
new file mode 100644
index 0000000..5c8258a
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/o32/developer/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/developer
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/default/linux/mips/13.0/o32/eapi
similarity index 100%
rename from profiles/arch/mips/mipsel/eapi
rename to profiles/default/linux/mips/13.0/o32/eapi
diff --git a/profiles/default/linux/mips/13.0/o32/parent b/profiles/default/linux/mips/13.0/o32/parent
new file mode 100644
index 0000000..3474061
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/mips/o32
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 06c71c2..f817458 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -88,16 +88,16 @@ m68k default/linux/m68k/13.0/desktop/kde exp
m68k default/linux/m68k/13.0/developer exp
# MIPS Profiles
-mips default/linux/mips/13.0 dev
+mips default/linux/mips/13.0/o32 dev
mips default/linux/mips/13.0/n32 dev
mips default/linux/mips/13.0/n64 exp
-mips default/linux/mips/13.0/multilib dev
+mips default/linux/mips/13.0/multilib/o32 dev
mips default/linux/mips/13.0/multilib/n32 dev
mips default/linux/mips/13.0/multilib/n64 exp
-mips default/linux/mips/13.0/mipsel dev
+mips default/linux/mips/13.0/mipsel/o32 dev
mips default/linux/mips/13.0/mipsel/n32 dev
mips default/linux/mips/13.0/mipsel/n64 exp
-mips default/linux/mips/13.0/mipsel/multilib dev
+mips default/linux/mips/13.0/mipsel/multilib/o32 dev
mips default/linux/mips/13.0/mipsel/multilib/n32 dev
mips default/linux/mips/13.0/mipsel/multilib/n64 exp
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-21 22:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-21 22:03 [gentoo-commits] proj/hardened-dev:profiles commit in: profiles/default/linux/mips/13.0/mipsel/multilib/o32/, Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox