Adding static useflag and klibc dependency as per upstream suggestion

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 55 insertions, 6 deletions

diff --git a/app-shells/mksh/ChangeLog b/app-shells/mksh/ChangeLog
index 560a48f3db91..3f2f18b6fc35 100644
--- a/app-shells/mksh/ChangeLog
+++ b/app-shells/mksh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/mksh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.38 2013/03/06 03:55:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/ChangeLog,v 1.39 2013/04/07 06:05:24 patrick Exp $
+
+*mksh-44-r1 (07 Apr 2013)
+
+  07 Apr 2013; Patrick Lauer <patrick@gentoo.org> +mksh-44-r1.ebuild,
+  mksh-9999.ebuild:
+  Adding static useflag and klibc dependency as per upstream suggestion
 
 *mksh-44 (06 Mar 2013)
 
diff --git a/app-shells/mksh/mksh-44-r1.ebuild b/app-shells/mksh/mksh-44-r1.ebuild
new file mode 100644
index 000000000000..f5eee43e498a
--- /dev/null
+++ b/app-shells/mksh/mksh-44-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-44-r1.ebuild,v 1.1 2013/04/07 06:05:24 patrick Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+ARC4_VERSION="1.14"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="app-arch/cpio
+	static? ( dev-libs/klibc )"
+RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	# we want to build static with klibc
+	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	# we can't assume lto existing/enabled, so we add a fallback
+	sh Build.sh -r -c lto || sh Rebuild.sh || die
+}
+
+src_install() {
+	exeinto /bin
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+}
+
+src_test() {
+	./test.sh || die
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index c41021a6ec9d..3cd2184d9674 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.4 2012/12/01 03:12:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/mksh/mksh-9999.ebuild,v 1.5 2013/04/07 06:05:24 patrick Exp $
 
 EAPI=4
 
@@ -13,9 +13,11 @@ if [[ $PV = 9999 ]]; then
 	ECVS_USER="_anoncvs"
 	ECVS_AUTH="ext"
 	KEYWORDS=""
+	DEPEND="static? ( dev-libs/klibc )"
 else
 	inherit unpacker
-	DEPEND="app-arch/cpio"
+	DEPEND="app-arch/cpio
+		static? ( dev-libs/klibc )"
 	SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.cpio.gz"
 	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 fi
@@ -24,13 +26,14 @@ DESCRIPTION="MirBSD Korn Shell"
 HOMEPAGE="http://mirbsd.de/mksh"
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
-DEPEND="${DEPEND}"
+IUSE="static"
 RDEPEND=""
 S="${WORKDIR}/${PN}"
 
 src_compile() {
 	tc-export CC
+	# we want to build static with klibc
+	if use static; then unset CC; export CC="/usr/bin/klcc"; export LDSTATIC="-static"; fi
 	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
 	sh Build.sh -r -c lto || sh Rebuild.sh || die
 }