From 855c3ceaa9f5e68508028608316d973e2068c924 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 24 Aug 2020 20:48:03 +0000 Subject: Mon Aug 24 20:48:03 UTC 2020 ap/nano-5.2-x86_64-1.txz: Upgraded. d/doxygen-1.8.20-x86_64-1.txz: Upgraded. d/nasm-2.15.03-x86_64-1.txz: Upgraded. Reverted to previous nasm since the new version has problems with some of the assembly included in Firefox. d/parallel-20200822-noarch-1.txz: Upgraded. l/libcap-ng-0.7.11-x86_64-1.txz: Upgraded. n/libgpg-error-1.39-x86_64-1.txz: Upgraded. n/libqmi-1.26.4-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.2.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/78.2.0/releasenotes/ (* Security fix *) xap/sane-1.0.31-x86_64-1.txz: Upgraded. --- source/d/yasm/yasm.SlackBuild | 266 +++++++++++++++++++----------------------- 1 file changed, 117 insertions(+), 149 deletions(-) (limited to 'source/d/yasm/yasm.SlackBuild') diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild index 8fde7a0ad..24dde5e60 100755 --- a/source/d/yasm/yasm.SlackBuild +++ b/source/d/yasm/yasm.SlackBuild @@ -1,68 +1,49 @@ #!/bin/bash -# $Id: yasm.SlackBuild,v 1.7 2009/05/12 20:24:31 root Exp root $ -# Copyright (c) 2008 Eric Hameleers -# Copyright 2010, 2018 Patrick Volkerding, Sebeka, MN, USA + +# Copyright 2008 Eric Hameleers +# Copyright 2010, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ----------------------------------------------------------------------------- +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers -# For: yasm -# Descr: complete rewrite of the NASM assembler -# URL: http://www.tortall.net/projects/yasm/ -# Needs: -# Changelog: -# 0.7.1-1: 16/Jun/2008 by Eric Hameleers -# * Initial build. -# 0.7.2-1: 08/dec/2008 by Eric Hameleers -# * Update. -# 0.8.0-1: 12/may/2009 by Eric Hameleers -# * Update. -# 1.1.0-1: 2010-08-31 by volkerdi@slackware.com -# * Update. -# 1.3.0-1: 2014-11-09 by Heinz Wiesinger -# * Update. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# Run 'sh yasm.SlackBuild' to build a Slackware package. -# The package (.txz) file is created in /tmp . -# Install using 'installpkg'. -# -# ----------------------------------------------------------------------------- - -# Where do we look for sources? -cd $(dirname $0) ; SRCDIR=$(pwd) +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=yasm -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} +# If you want to disable python bindings, set ENABLE_PYTHON to "YES". +ENABLE_PYTHON=${ENABLE_PYTHON:-"'NO"} +if [ "$ENABLE_PYTHON" = "YES" ]; then + PYTHONSTUFF="--enable-python --enable-python-bindings" +else + PYTHONSTUFF="" +fi + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi # If the variable PRINT_PACKAGE_NAME is set, then this script will report what @@ -73,111 +54,98 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then 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"} +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi -# Place to build (TMP) package (PKG) and output (OUTPUT) the program: -TMP=${TMP:-/tmp/build} +TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -OUTPUT=${OUTPUT:-/tmp} - -# Exit the script on errors: -set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PKGNAM}.log' ERR -# Catch unitialized variables: -set -u -P1=${1:-1} - -case "$ARCH" in - i586) SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - s390) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - powerpc) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; -esac - -# Create working directories: -mkdir -p $OUTPUT # place for the package to be saved -mkdir -p $TMP/tmp-$PKGNAM # location to build the source -mkdir -p $PKG # place for the package to be built -rm -rf $PKG/* # always erase old package's contents -rm -rf $TMP/tmp-$PKGNAM/* # remove the remnants of previous build - -# --- PACKAGE BUILDING --- - -echo "++" -echo "|| $PKGNAM-$VERSION" -echo "++" - -cd $TMP/tmp-$PKGNAM -echo "Extracting the source archive(s) for $PKGNAM..." -tar xvf $SRCDIR/$PKGNAM-$VERSION.tar.?z* -cd ${PKGNAM}-${VERSION} -chown -R root:root . -chmod -R u+w,go+r-w,a-s . -if [ "$ENABLE_PYTHON" = "YES" ]; then - PYTHONSTUFF="--enable-python --enable-python-bindings" -else - PYTHONSTUFF="" -fi +rm -rf $PKG +mkdir -p $TMP $PKG -echo Building ... -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - ${PYTHONSTUFF} \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux - -make - -make DESTDIR=$PKG install - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION || true -rm $PKG/usr/doc/$PKGNAM-$VERSION/CMakeLists.txt -chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \+ - -# Remove empty share directory: -rmdir $PKG/usr/share || true - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi fi +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $PYTHONSTUFF \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* Artistic.txt BSD.txt ChangeLog COPYING* GNU_* NEWS* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi -# Add a package description: mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +cat $CWD/slack-desc > $PKG/install/slack-desc -# Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz -- cgit v1.2.3