diff options
Diffstat (limited to 'source/d/yasm')
| -rw-r--r-- | source/d/yasm/slack-desc | 8 | ||||
| -rwxr-xr-x | source/d/yasm/yasm.SlackBuild | 24 |
2 files changed, 20 insertions, 12 deletions
diff --git a/source/d/yasm/slack-desc b/source/d/yasm/slack-desc index fc28253f2..8907db50e 100644 --- a/source/d/yasm/slack-desc +++ b/source/d/yasm/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| @@ -10,7 +10,7 @@ yasm: yasm (complete rewrite of the NASM assembler) yasm: yasm: Yasm is a complete rewrite of the NASM assembler under the "new" BSD yasm: License (some portions are under other licenses, see COPYING for -yasm: details). Yasm currently supports the x86 and AMD64 instruction sets, +yasm: details). Yasm currently supports the x86 and AMD64 instruction sets, yasm: accepts NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, yasm: 32 and 64-bit Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, yasm: and generates source debugging information in STABS, DWARF 2, and diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild index 20c7fccd3..ae976f889 100755 --- a/source/d/yasm/yasm.SlackBuild +++ b/source/d/yasm/yasm.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # $Id: yasm.SlackBuild,v 1.7 2009/05/12 20:24:31 root Exp root $ # Copyright (c) 2008 Eric Hameleers <alien@slackware.com> -# Copyright 2010 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2010, 2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -48,29 +48,37 @@ # # ----------------------------------------------------------------------------- +# Where do we look for sources? +cd $(dirname $0) ; SRCDIR=$(pwd) + PKGNAM=yasm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* NEWS README *.txt" # If you want to disable python bindings, set ENABLE_PYTHON to "NO". # Building python support requires Cython, which is not shipped with Slackware. ENABLE_PYTHON=${ENABLE_PYTHON:-"'NO"} -# Where do we look for sources? -SRCDIR=$(cd $(dirname $0); pwd) - # Place to build (TMP) package (PKG) and output (OUTPUT) the program: TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PKGNAM @@ -84,7 +92,7 @@ set -u P1=${1:-1} case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i586) SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; s390) SLKCFLAGS="-O2" |