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

[Michał Górny]

On Tue, 2019-10-22 at 19:02 +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         | 52 +++++++++++++++++++++++
>  app-shells/mksh/mksh-9999.ebuild          | 12 +++---
>  profiles/base/package.use.mask            |  4 ++
>  profiles/features/musl/package.use.mask   |  3 ++
>  profiles/features/uclibc/package.use.mask |  3 ++
>  5 files changed, 68 insertions(+), 6 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..ae3367f2066
> --- /dev/null
> +++ b/app-shells/mksh/mksh-57-r2.ebuild
> @@ -0,0 +1,52 @@
> +# 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"
> +
> +LICENSE="BSD"
> +SLOT="0"
> +IUSE="static test"
> +
> +DEPEND="
> +	test? (
> +		dev-lang/perl
> +		sys-apps/ed
> +	)
> +"
> +
> +S="${WORKDIR}/${PN}"
> +
> +src_compile() {
> +	tc-export CC
> +	use static && export LDSTATIC="-static"
> +	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() {
> +	sh test.sh -v || die
> +}
> diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
> index 3aa638fe245..ae3367f2066 100644
> --- a/app-shells/mksh/mksh-9999.ebuild
> +++ b/app-shells/mksh/mksh-9999.ebuild
> @@ -14,28 +14,28 @@ if [[ $PV = 9999 ]]; then
>  	KEYWORDS=""
>  else
>  	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
> -	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
> +	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"
> +
>  LICENSE="BSD"
>  SLOT="0"
>  IUSE="static test"
> -RDEPEND="static? ( dev-libs/klibc )"
> +
>  DEPEND="
> -	${RDEPEND}
>  	test? (
>  		dev-lang/perl
>  		sys-apps/ed
>  	)
>  "
> +
>  S="${WORKDIR}/${PN}"
>
>  src_compile() {
>  	tc-export CC
> -	# we want to build static with klibc
> -	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
> +	use static && export LDSTATIC="-static"
>  	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
>  	sh Build.sh -r || die
>  }
> @@ -48,5 +48,5 @@ src_install() {
>  }
>
>  src_test() {
> -	./test.sh -v || die
> +	sh test.sh -v || die
>  }
> diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
> index 11e10e8cf56..6d573a628c2 100644
> --- a/profiles/base/package.use.mask
> +++ b/profiles/base/package.use.mask
> @@ -7,6 +7,10 @@
>  # This file is only for generic masks. For arch-specific masks (i.e.
>  # mask everywhere, unmask on arch/*) use arch/base.
>
> +# Haelwenn (lanodan) Monnier <contact@×××××××××.me> (2019-09-19)
> +# broken static-linking in glibc and maybe others
> +>app-shells/mksh-57-r1 static
> +
>  # Michał Górny <mgorny@g.o> (2019-10-05)
>  # net-libs/openslp is being removed.
>  net-nds/openldap slp
> diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
> index 28e05a4e490..42fe7d31b2c 100644
> --- a/profiles/features/musl/package.use.mask
> +++ b/profiles/features/musl/package.use.mask
> @@ -16,3 +16,6 @@ sys-fs/e2fsprogs nls
>  # as a fail-only stub in musl. breaks horribly if enabled.
>  # bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
>  app-shells/bash mem-scramble
> +
> +# static linking works with musl
> +app-shells/mksh -static
> diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
> index eb7b5dc0216..b00ae69a84a 100644
> --- a/profiles/features/uclibc/package.use.mask
> +++ b/profiles/features/uclibc/package.use.mask
> @@ -22,3 +22,6 @@ dev-util/geany-plugins gtkspell
>  # 'append-libs', but xfsdump's build system doesn't honor $LIBS.
>  # So this is the best way for now.  See 570548.
>  sys-fs/xfsdump nls
> +
> +# static linking works with uClibc
> +app-shells/mksh -static

The tests fail for me.  Or rather, don't happen at all:

>>> Test phase: app-shells/mksh-57-r2
 * Testing regular mksh.
 * ERROR: app-shells/mksh-57-r2::gentoo failed (test phase):
 *   (no error message)
 * 
 * Call stack:
 *     ebuild.sh, line 125:  Called src_test
 *   environment, line 1126:  Called die
 * The specific snippet of code:
 *       sh test.sh -v || die;

Also:

app-shells/mksh
  HttpsUrlAvailable: version 57-r2: HTTPS url available: http://mirbsd.de/mksh -> https://www.mirbsd.org/mksh.htm
  HttpsUrlAvailable: version 57-r2: HTTPS url available: http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz -> https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz
  MissingTestRestrict: version 57-r2: missing RESTRICT="!test? ( test )" with IUSE=test
  HttpsUrlAvailable: version 9999: HTTPS url available: http://mirbsd.de/mksh -> https://www.mirbsd.org/mksh.htm
  MissingTestRestrict: version 9999: missing RESTRICT="!test? ( test )" with IUSE=test


-- 
Best regards,
Michał Górny