[gentoo-commits] repo/gentoo:master commit in: profiles/, sys-libs/musl/, profiles/default/linux/m68k/17.0/musl/

[gentoo-commits] repo/gentoo:master commit in: profiles/, sys-libs/musl/, profiles/default/linux/m68k/17.0/musl/

[James Le Cuirot]

commit:     68a23a753439ef5439a5ff847de84b0601b47df0
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Mon Jun 26 15:51:44 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 22:20:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a23a75

profiles: Add m68k musl profile support

sys-libs/musl: m68k keywording

After testing this profile and musl support has been working on my m68k system so is ready for review.
I've added sys-libs/musl keywording at the same time as per the bug request.

This includes the suggested profile changes by Chewi and Matoro for a cleaner profile.

Closes: https://bugs.gentoo.org/909040

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31604
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 profiles/default/linux/m68k/17.0/musl/eapi          | 1 +
 profiles/default/linux/m68k/17.0/musl/make.defaults | 5 +++++
 profiles/default/linux/m68k/17.0/musl/parent        | 2 ++
 profiles/profiles.desc                              | 1 +
 sys-libs/musl/musl-1.2.4.ebuild                     | 2 +-
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/profiles/default/linux/m68k/17.0/musl/eapi b/profiles/default/linux/m68k/17.0/musl/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/musl/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/default/linux/m68k/17.0/musl/make.defaults b/profiles/default/linux/m68k/17.0/musl/make.defaults
new file mode 100644
index 000000000000..2c9e7286c2e7
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="m68k-unknown-linux-musl"
+CHOST_m68k="${CHOST}"

diff --git a/profiles/default/linux/m68k/17.0/musl/parent b/profiles/default/linux/m68k/17.0/musl/parent
new file mode 100644
index 000000000000..58651906cb67
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/musl

diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index b685eb3007be..563718973e22 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -351,6 +351,7 @@ arm64		default/linux/arm64/17.0/musl					dev
 arm64		default/linux/arm64/17.0/musl/llvm				exp
 arm64		default/linux/arm64/17.0/musl/hardened				exp
 arm64		default/linux/arm64/17.0/musl/hardened/selinux			exp
+m68k		default/linux/m68k/17.0/musl					exp
 mips		default/linux/mips/17.0/o32/musl				exp
 mips		default/linux/mips/17.0/n64/musl				exp
 mips		default/linux/mips/17.0/mipsel/o32/musl				exp

diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild
index 708674beb55e..a0653436a844 100644
--- a/sys-libs/musl/musl-1.2.4.ebuild
+++ b/sys-libs/musl/musl-1.2.4.ebuild
@@ -13,7 +13,7 @@ else
 
 	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
 fi