diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2018-06-03 12:07:38 +0100 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2018-06-03 18:11:01 +0100 |
| commit | bab39a97c3cd0a88fb6a8bcfce6e898f2f02fc53 (patch) | |
| tree | cc8169dd469cc447f6603f4565439ee7a4cf6d3a | |
| parent | cce3444ba5b40c1d65377f5c68e4f4f009c2e55f (diff) | |
development/mlton: Fix ownership + cleanups.
Bad file ownership caused by 'make install' exploding tarballs
in the upstream sources.
Limit memory usage (build fail with large memory).
ARCH wasn't checked when explicitly set.
The build fails with multiple make jobs.
BUILD is for the output package name, don't conflate it
with the last bit of PREBUILT.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | development/mlton/mlton.SlackBuild | 28 | ||||
| -rw-r--r-- | development/mlton/mlton.info | 2 |
2 files changed, 18 insertions, 12 deletions
diff --git a/development/mlton/mlton.SlackBuild b/development/mlton/mlton.SlackBuild index c399bb907b9a2..823ca65d83cd0 100644 --- a/development/mlton/mlton.SlackBuild +++ b/development/mlton/mlton.SlackBuild @@ -28,14 +28,13 @@ PRGNAM=mlton VERSION=${VERSION:-20180207} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -PREBUILT=$PRGNAM-$VERSION-$BUILD.amd64-linux +PREBUILT=${PREBUILT:-$PRGNAM-$VERSION-1.amd64-linux} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - x86_64) ARCH=x86_64 ;; +ARCH=${ARCH:-$(uname -m)} +case "$ARCH" in + x86_64) : ;; *) printf "This script only supports x86_64.\n" 1>&2; exit 1 ;; - esac -fi +esac CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -51,22 +50,29 @@ rm -rf $PREBUILT $PRGNAM-$VERSION tar xvf $CWD/$PREBUILT.tgz tar xvf $CWD/$PRGNAM-$VERSION.src.tgz -cd $PRGNAM-$VERSION - # Permissions are already set -chown -R root:root . +chown -R root:root $PREBUILT $PRGNAM-$VERSION + +cd $PRGNAM-$VERSION # Prefer the pre-built compiler PATH=$TMP/$PREBUILT/bin:$PATH -make all + +# Without any ulimit, "amd64 code gen" uses all available memory. +ulimit -v 4000000 + +make -j1 all make PREFIX="$PKG" install +# Fix ownership of stuff from 'make install' +chown -R root:root $PKG + # Binaries are already stripped cd $PKG mkdir -p usr mv share/man usr -if [ "$1" == "-docs" ]; then +if [ "$1" = "-docs" ]; then mkdir -p usr/share/doc mv share/doc/$PRGNAM usr/share/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > usr/share/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/mlton/mlton.info b/development/mlton/mlton.info index 3df87be025482..94214390e358e 100644 --- a/development/mlton/mlton.info +++ b/development/mlton/mlton.info @@ -4,7 +4,7 @@ HOMEPAGE="http://mlton.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" DOWNLOAD_x86_64="https://downloads.sourceforge.net/project/mlton/mlton/20180207/mlton-20180207-1.amd64-linux.tgz \ - https://downloads.sourceforge.net/project/mlton/mlton/20180207/mlton-20180207.src.tgz" + https://downloads.sourceforge.net/project/mlton/mlton/20180207/mlton-20180207.src.tgz" MD5SUM_x86_64="e318ea7d87cb1996c921810e278cb717 \ efa5a6b70d964daefefe4b2581173ad9" REQUIRES="" |