commit:     cfa2c824755cd4cef61045bd4b703d773b0ed05d
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 20:09:24 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 20:09:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa2c824

sys-libs/musl: unbreak cross-compiles

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 sys-libs/musl/musl-1.2.1-r2.ebuild | 3 +--
 sys-libs/musl/musl-1.2.2-r2.ebuild | 3 +--
 sys-libs/musl/musl-9999.ebuild     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys-libs/musl/musl-1.2.1-r2.ebuild 
b/sys-libs/musl/musl-1.2.1-r2.ebuild
index 5e1a335f41a..02735e87688 100644
--- a/sys-libs/musl/musl-1.2.1-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.1-r2.ebuild
@@ -123,9 +123,8 @@ src_install() {
                dobin "${T}"/iconv
                echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || 
die
                doenvd "${T}"/00musl
+               dolib.a libssp_nonshared.a
        fi
-
-       dolib.a libssp_nonshared.a
 }
 
 pkg_postinst() {

diff --git a/sys-libs/musl/musl-1.2.2-r2.ebuild 
b/sys-libs/musl/musl-1.2.2-r2.ebuild
index 9025fd02109..d9551e1c7e4 100644
--- a/sys-libs/musl/musl-1.2.2-r2.ebuild
+++ b/sys-libs/musl/musl-1.2.2-r2.ebuild
@@ -131,9 +131,8 @@ src_install() {
                dobin "${T}"/iconv
                echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || 
die
                doenvd "${T}"/00musl
+               dolib.a libssp_nonshared.a
        fi
-
-       dolib.a libssp_nonshared.a
 }
 
 pkg_postinst() {

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 9025fd02109..d9551e1c7e4 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -131,9 +131,8 @@ src_install() {
                dobin "${T}"/iconv
                echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || 
die
                doenvd "${T}"/00musl
+               dolib.a libssp_nonshared.a
        fi
-
-       dolib.a libssp_nonshared.a
 }
 
 pkg_postinst() {

Reply via email to