summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Reichelt <slackbuilds@mareichelt.de>2020-05-09 13:21:13 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-05-10 08:37:01 +0700
commitb94b29ab1bdf8925f05670137d3c2269b82e6c2b (patch)
tree025e3a8a51be7987c1a70f915f0d1b8691a2ebe8
parent8f707998e6866d7d83eeb8a2e3285adeed7e6dc7 (diff)
downloadslackbuilds-b94b29ab1bdf8925f05670137d3c2269b82e6c2b.tar.gz
system/mksh: Updated for version R59.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/mksh/README3
-rw-r--r--system/mksh/mksh.SlackBuild17
-rw-r--r--system/mksh/mksh.info6
3 files changed, 17 insertions, 9 deletions
diff --git a/system/mksh/README b/system/mksh/README
index e741b2c12e..7907a1cfd9 100644
--- a/system/mksh/README
+++ b/system/mksh/README
@@ -5,3 +5,6 @@ Pass STATIC=yes to the script to create a static build.
Pass DIET=yes to the script in order to use dietlibc (this
requires the optional dependency dietlibc)
+
+Pass MUSL=yes to the script in order to use musl (this
+requires the optional dependency musl)
diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild
index f519ed2e86..a1f011e469 100644
--- a/system/mksh/mksh.SlackBuild
+++ b/system/mksh/mksh.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for mksh
-# Copyright (c) 2011-2019 Markus Reichelt, Aachen, DE
+# Copyright (c) 2011-2020 Markus Reichelt, Aachen, DE
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -26,7 +26,7 @@
# Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115
PRGNAM=mksh
-VERSION=${VERSION:-R57}
+VERSION=${VERSION:-R59}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -66,6 +66,9 @@ rm -rf $PRGNAM
tar xf $CWD/$PRGNAM-$VERSION.tgz
cd $PRGNAM
+CC="gcc"
+SLKCFLAGS="${SLKCFLAGS} -Wall"
+
if [ "$STATIC" = "yes" ]; then
LDFLAGS="${LDFLAGS} -static"
CPPFLAGS="${CPPFLAGS} -DMKSH_NOPWNAM"
@@ -73,9 +76,10 @@ fi
if [ "$DIET" = "yes" ]; then
CC="diet -Os gcc"
- SLKCFLAGS="${SLKCFLAGS} -Wall"
-else
- CC="gcc"
+fi
+
+if [ "$MUSL" = "yes" ]; then
+ CC="musl-gcc"
fi
chown -R root:root .
@@ -92,7 +96,8 @@ LDFLAGS=$LDFLAGS \
CPPFLAGS=$CPPFLAGS \
CFLAGS=$SLKCFLAGS \
CC=$CC \
- sh ../Build.sh -r -c lto
+ sh ../Build.sh -r
+./test.sh
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install
diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info
index 0ef916bddd..d50ce27aa6 100644
--- a/system/mksh/mksh.info
+++ b/system/mksh/mksh.info
@@ -1,8 +1,8 @@
PRGNAM="mksh"
-VERSION="R57"
+VERSION="R59"
HOMEPAGE="http://mirbsd.de/mksh"
-DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz"
-MD5SUM="4d2686535252ea6a57bdec531498239a"
+DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59.tgz"
+MD5SUM="995ddf33b4b52d48bb9a648ce996f791"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""