[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

[Sam James]

commit:     ec05593c803806726bf17fe2ef956680def9467f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 08:41:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 08:42:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec05593c

sys-libs/musl: always install libssp_nonshared.a

Needed to avoid SSP hacks for cross (if we don't install it, we have to
deal with conditionally patching GCC).

Bug: https://bugs.gentoo.org/862831
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/musl/{musl-9999.ebuild => musl-1.2.3-r6.ebuild} | 8 +++++++-
 sys-libs/musl/musl-9999.ebuild                           | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r6.ebuild
similarity index 97%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.3-r6.ebuild
index 2c0d803dd8f4..231c91cb5ce1 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -181,6 +181,12 @@ src_install() {
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
 		doenvd "${T}"/00musl
+	fi
+
+	if is_crosscompile ; then
+		into /usr/${CTARGET}
+		dolib.a libssp_nonshared.a
+	else
 		dolib.a libssp_nonshared.a
 	fi
 }

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 2c0d803dd8f4..231c91cb5ce1 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -181,6 +181,12 @@ src_install() {
 		dobin "${T}"/iconv
 		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
 		doenvd "${T}"/00musl
+	fi
+
+	if is_crosscompile ; then
+		into /usr/${CTARGET}
+		dolib.a libssp_nonshared.a
+	else
 		dolib.a libssp_nonshared.a
 	fi
 }