overlay

commit: 45ec7a18aa3deba38b39e9c60c5705638c9698e5
parent: 58802bbe5356b674baa2cb39c3916ba491e608db
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 16 Apr 2019 19:43:24 +0200

app-shells/mksh: Add lksh and -v on test.sh

Diffstat:
M
app-shells/mksh/metadata.xml
3
+++
M
app-shells/mksh/mksh-57.ebuild
14
+++++++++++---
M
app-shells/mksh/mksh-9999.ebuild
18
+++++++++++++-----

3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
@@ -5,4 +5,7 @@
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
+	<use>
+		<flag name="lksh">Builds the POSIX-Compliant arithmetics (host’s long) variant</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-shells/mksh/mksh-57.ebuild b/app-shells/mksh/mksh-57.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-IUSE="static"
+IUSE="static +lksh"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
 S="${WORKDIR}/${PN}"
@@ -31,16 +31,24 @@ src_compile() {
 	# we want to build static with klibc
 	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r || die
+	# TODO: Ask baselayout to replace mksh with lksh instead
+	if use lksh
+	then
+		export CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED"
+		sh Build.sh -r -L || die
+	else
+		sh Build.sh -r || die
+	fi
 }
 
 src_install() {
 	exeinto /bin
+	use lksh && doexe lksh
 	doexe mksh
 	doman mksh.1
 	dodoc dot.mkshrc
 }
 
 src_test() {
-	./test.sh || die
+	./test.sh -v || die
 }
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-IUSE="static"
+IUSE="static +lksh"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
 S="${WORKDIR}/${PN}"
@@ -31,16 +31,24 @@ src_compile() {
 	# we want to build static with klibc
 	if use static; then export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
-	sh Build.sh -r || die
+	# TODO: Ask baselayout to replace mksh with lksh instead
+	if use lksh
+	then
+		export CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED"
+		sh Build.sh -r -L || die
+	else
+		sh Build.sh -r || die
+	fi
 }
 
 src_install() {
-	into /
-	dobin mksh
+	exeinto /bin
+	use lksh && doexe lksh
+	doexe mksh
 	doman mksh.1
 	dodoc dot.mkshrc
 }
 
 src_test() {
-	./test.sh || die
+	./test.sh -v || die
 }