commit: 40a8f13c5c6e1ab840eb57d47c0eba58f2e90634
Author: Michał Górny gentoo org>
AuthorDate: Sat Jun 18 07:40:40 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Jun 22 06:43:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a8f13c
profiles/arch/s390: Move s390-specific stuff to subprofile
Rather than setting stuff specific to not-x s390 in the top profile
and undoing it for s390x, move it to the new subprofile.
Signed-off-by: Michał Górny gentoo.org>
profiles/arch/s390/make.defaults | 15 +--
profiles/arch/s390/{ => s390}/make.defaults | 19 +--
profiles/arch/s390/{ => s390}/package.mask | 0
profiles/arch/s390/{s390x => s390}/use.force | 5 ++---
profiles/arch/s390/s390/use.mask | 9 +
profiles/arch/s390/s390x/make.defaults | 4 ++--
profiles/arch/s390/s390x/package.mask| 20
profiles/arch/s390/s390x/use.force | 3 +--
profiles/arch/s390/s390x/use.mask| 10 --
profiles/arch/s390/use.force | 5 +
profiles/arch/s390/use.mask | 7 ---
11 files changed, 21 insertions(+), 76 deletions(-)
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index fc8cc4a45203..3fde361195fe 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,14 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ARCH="s390"
ACCEPT_KEYWORDS="s390 ~s390"
-MULTILIB_ABIS="s390"
-DEFAULT_ABI="s390"
-ABI="${DEFAULT_ABI}"
-
-CHOST="s390-ibm-linux-gnu"
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
FFLAGS="${CFLAGS}"
@@ -20,14 +15,6 @@ LIBDIR_s390="lib"
INPUT_DEVICES="void"
VIDEO_CARDS="dummy"
-# Michał Górny (2014-07-01)
-# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
-# by non-multilib ebuilds when non-native ABIs are disabled.
-IUSE_IMPLICIT="abi_s390_32"
-
-# Enable abi_s390_32 for packages that don't have it forced.
-ABI_S390="32"
-
# While multilib is available, we don't default it to on.
BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
USE="-multilib"
diff --git a/profiles/arch/s390/make.defaults
b/profiles/arch/s390/s390/make.defaults
similarity index 55%
copy from profiles/arch/s390/make.defaults
copy to profiles/arch/s390/s390/make.defaults
index fc8cc4a45203..8e77858de386 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/s390/make.defaults
@@ -1,24 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-ARCH="s390"
-ACCEPT_KEYWORDS="s390 ~s390"
-
MULTILIB_ABIS="s390"
DEFAULT_ABI="s390"
ABI="${DEFAULT_ABI}"
CHOST="s390-ibm-linux-gnu"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-LIBDIR_s390x="lib64"
-LIBDIR_s390="lib"
-
-INPUT_DEVICES="void"
-VIDEO_CARDS="dummy"
# Michał Górny (2014-07-01)
# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
@@ -27,7 +14,3 @@ IUSE_IMPLICIT="abi_s390_32"
# Enable abi_s390_32 for packages that don't have it forced.
ABI_S390="32"
-
-# While multilib is available, we don't default it to on.
-BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
-USE="-multilib"
diff --git a/profiles/arch/s390/package.mask
b/profiles/arch/s390/s390/package.mask
similarity index 100%
rename from profiles/arch/s390/package.mask
rename to profiles/arch/s390/s390/package.mask
diff --git a/profiles/arch/s390/s390x/use.force
b/profiles/arch/s390/s390/use.force
similarity index 63%
copy from profiles/arch/s390/s390x/use.force
copy to profiles/arch/s390/s390/use.force
index adf5b7184416..6f275ed053ce 100644
--- a/profiles/arch/s390/s390x/use.force
+++ b/profiles/arch/s390/s390/use.force
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2022 Gentoo Authors.
# Distributed under the terms of the GNU General Public License, v2
# Force the flag corresponding to the only ABI.
--abi_s390_32
-abi_s390_64
+abi_s390_32
diff --git a/profiles/arch/s390/s390/use.mask b/profiles/arch/s390/s390/use.mask
new file mode 100644
index ..ec8bfdf76289
--- /dev/null
+++ b/profiles/arch/s390/s390/use.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask ABI flags for this arch.
+-abi_s390_32
+
+# sys-libs/libunwind is masked on s390, but enabled on s390x
+unwind
+libunwind
diff --git a/profiles/arch/s390/s390x/make.defaults
b/profiles/arch/s390/s390x/make.defaults
index 1cb8ff7551a4..b02ae878cf6e 100644
--- a/profiles/arch/s390/s390x/make.defaults
+++ b/profiles/arch/s390/s390x/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of
