commit:     b53a8bbfb7f20ca11a936818443f7080fcad5ad4
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri May  5 01:23:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 04:41:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53a8bbf

sys-devel/slibtool: fix the build in some chroots

When building slibtool in a chroot where the SHELL is set as
/sbin/nologin the sofort configure will fail. This can be worked around
for now by explicitly setting the shell as /bin/sh during configure.

Also fixes the libdir path and updates to EAPI=8.

Closes: https://bugs.gentoo.org/905721
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30878
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/slibtool/slibtool-0.5.34.ebuild | 7 ++++---
 sys-devel/slibtool/slibtool-9999.ebuild   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-devel/slibtool/slibtool-0.5.34.ebuild 
b/sys-devel/slibtool/slibtool-0.5.34.ebuild
index c176e886d89c..747b80b4a308 100644
--- a/sys-devel/slibtool/slibtool-0.5.34.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.34.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -32,6 +32,7 @@ src_configure() {
                --compiler="$(tc-getCC)" \
                --host=${CHOST} \
                --prefix="${EPREFIX}"/usr \
-               --libdir="$(get_libdir)" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --shell="${EPREFIX}"/bin/sh \
                        || die
 }

diff --git a/sys-devel/slibtool/slibtool-9999.ebuild 
b/sys-devel/slibtool/slibtool-9999.ebuild
index 200a19a514d4..5295be737954 100644
--- a/sys-devel/slibtool/slibtool-9999.ebuild
+++ b/sys-devel/slibtool/slibtool-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -32,6 +32,7 @@ src_configure() {
                --compiler="$(tc-getCC)" \
                --host=${CHOST} \
                --prefix="${EPREFIX}"/usr \
-               --libdir="$(get_libdir)" \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --shell="${EPREFIX}"/bin/sh \
                        || die
 }

Reply via email to