diff options
| -rw-r--r-- | app-shells/mksh/mksh-57-r2.ebuild | 54 | ||||
| -rw-r--r-- | app-shells/mksh/mksh-9999.ebuild | 16 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 | ||||
| -rw-r--r-- | profiles/features/musl/package.use.mask | 3 | ||||
| -rw-r--r-- | profiles/features/uclibc/package.use.mask | 3 |
5 files changed, 73 insertions, 7 deletions
diff --git a/app-shells/mksh/mksh-57-r2.ebuild b/app-shells/mksh/mksh-57-r2.ebuild new file mode 100644 index 000000000000..b818b1caf1a2 --- /dev/null +++ b/app-shells/mksh/mksh-57-r2.ebuild @@ -0,0 +1,54 @@ +# 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="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" +RESTRICT="!test? ( 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() { + ./mksh test.sh -v || die +} diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild index 3aa638fe2453..b818b1caf1a2 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 e5768830f1eb..68213dc90544 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@hacktivis.me> (2019-12-01) +# broken static-linking in glibc and maybe others +>app-shells/mksh-57-r1 static + # Andreas Sturmlechner <asturm@gentoo.org> (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 e8ef0ab07a3e..117568e0a6bd 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 eb7b5dc02161..b00ae69a84ab 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 |