commit: 9629083d7b4571de1d17548e90854346a277dcd4 Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Mon Nov 25 07:27:20 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Dec 1 23:24:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9629083d
app-shells/mksh: USE=static now uses the system libc 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 <AT> hacktivis.me> Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-shells/mksh/{mksh-9999.ebuild => mksh-57-r2.ebuild} | 16 +++++++++------- app-shells/mksh/mksh-9999.ebuild | 16 +++++++++------- profiles/base/package.use.mask | 4 ++++ profiles/features/musl/package.use.mask | 3 +++ profiles/features/uclibc/package.use.mask | 3 +++ 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-57-r2.ebuild similarity index 65% copy from app-shells/mksh/mksh-9999.ebuild copy to app-shells/mksh/mksh-57-r2.ebuild index 3aa638fe245..b818b1caf1a 100644 --- a/app-shells/mksh/mksh-9999.ebuild +++ b/app-shells/mksh/mksh-57-r2.ebuild @@ -13,29 +13,31 @@ if [[ $PV = 9999 ]]; then ECVS_AUTH="ext" KEYWORDS="" else - SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"; - KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://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" +# Host is TLSv1.0-only, keep to http for compatibility with modern browsers HOMEPAGE="http://mirbsd.de/mksh"; + LICENSE="BSD" SLOT="0" IUSE="static test" -RDEPEND="static? ( dev-libs/klibc )" +RESTRICT="!test? ( test )" + 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 +50,5 @@ src_install() { } src_test() { - ./test.sh -v || die + ./mksh test.sh -v || die } diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild index 3aa638fe245..b818b1caf1a 100644 --- a/app-shells/mksh/mksh-9999.ebuild +++ b/app-shells/mksh/mksh-9999.ebuild @@ -13,29 +13,31 @@ if [[ $PV = 9999 ]]; then ECVS_AUTH="ext" KEYWORDS="" else - SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"; - KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + SRC_URI="https://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" +# Host is TLSv1.0-only, keep to http for compatibility with modern browsers HOMEPAGE="http://mirbsd.de/mksh"; + LICENSE="BSD" SLOT="0" IUSE="static test" -RDEPEND="static? ( dev-libs/klibc )" +RESTRICT="!test? ( test )" + 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 +50,5 @@ src_install() { } src_test() { - ./test.sh -v || die + ./mksh test.sh -v || die } diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index e5768830f1e..68213dc9054 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 <[email protected]> (2019-12-01) +# broken static-linking in glibc and maybe others +>app-shells/mksh-57-r1 static + # Andreas Sturmlechner <[email protected]> (2019-11-30) # Depends on about-to-be-last-rited media-libs/mediastreamer kde-apps/kopete jingle diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index e8ef0ab07a3..117568e0a6b 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -20,3 +20,6 @@ app-shells/bash mem-scramble # lto builds are known to cause an OOM issue during build. mail-client/thunderbird lto www-client/firefox lto + +# 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
