Re: [gentoo-proxy-maint] [PATCH 1/2] app-shells/mksh: USE=static now uses the system libc

[Michał Górny]

On Thu, 2019-09-19 at 19:47 +0200, Haelwenn (lanodan) Monnier wrote:
> Which means that glibc needs to be masked as it's static-linking is
> broken.
>
> I considered dietlibc as a replacement to klibc but:
> - dietlibc is maintained-needed too
> - it could be a elibc_glibc? in DEPEND but this would probably be a
> noblah USE flag
> - it would mean that arches where mksh is believed to work and some of
> our libc do but not dietlibc or klibc (like alpha with bug #487672)
> would be prevented from USE=static
>
> Closes: https://bugs.gentoo.org/653388
> Signed-off-by: Haelwenn (lanodan) Monnier <contact@×××××××××.me>
> ---
>  app-shells/mksh/mksh-57-r2.ebuild         | 49 +++++++++++++++++++++++
>  app-shells/mksh/mksh-9999.ebuild          |  7 +---
>  profiles/base/package.use.mask            |  4 ++
>  profiles/features/musl/package.use.mask   |  3 ++
>  profiles/features/uclibc/package.use.mask |  3 ++
>  5 files changed, 61 insertions(+), 5 deletions(-)
>  create mode 100644 app-shells/mksh/mksh-57-r2.ebuild
>
> diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild
> new file mode 100644
> index 00000000000..cb6db11f38c
> --- /dev/null
> +++ b/app-shells/mksh/mksh-57-r2.ebuild
> @@ -0,0 +1,49 @@
> +# Copyright 1999-2019 Gentoo Authors
> +# Distributed under the terms of the GNU General Public License v2
> +
> +EAPI=7
> +
> +inherit toolchain-funcs
> +
> +if [[ $PV = 9999 ]]; then
> +	inherit cvs
> +	ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
> +	ECVS_MODULE="mksh"
> +	ECVS_USER="_anoncvs"
> +	ECVS_AUTH="ext"
> +	KEYWORDS=""
> +else
> +	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
> +	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
> +fi
> +
> +DESCRIPTION="MirBSD Korn Shell"
> +HOMEPAGE="http://mirbsd.de/mksh"

Please add empty line here.

> +LICENSE="BSD"
> +SLOT="0"
> +IUSE="static test"

...and here.

> +DEPEND="
> +	test? (
> +		dev-lang/perl
> +		sys-apps/ed
> +	)
> +"

...and possibly here, or just move S below HOMEPAGE.

I know this is nitpicking but when you work on a lot of ebuilds, you get
used to a particular ordering and grouping, and this helps us work
faster.

> +S="${WORKDIR}/${PN}"
> +
> +src_compile() {
> +	tc-export CC
> +	if use static; then export LDSTATIC="-static"; fi

use static && ...

Also, what's the purpose of this anyway?  I mean, I can understand
having busybox static so you could use it with broken libc.  But what's
the use for static mksh?

> +	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
> +	sh Build.sh -r || die
> +}
> +
> +src_install() {
> +	into /
> +	dobin mksh
> +	doman mksh.1
> +	dodoc dot.mkshrc
> +}
> +
> +src_test() {
> +	./test.sh -v || die

I'd probably use 'sh test.sh' for consistency with how you call Build.sh
;-).


-- 
Best regards,
Michał Górny