diff options
Diffstat (limited to 'slackware64-current/source/n/cyrus-sasl/cyrus-sasl.SlackBuild')
| -rwxr-xr-x | slackware64-current/source/n/cyrus-sasl/cyrus-sasl.SlackBuild | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/slackware64-current/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/slackware64-current/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index c47821d55..0cbad20a9 100755 --- a/slackware64-current/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/slackware64-current/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +22,12 @@ PKGNAM=cyrus-sasl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} # 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 ) ;; @@ -38,8 +38,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-cyrus-sasl -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -59,11 +59,9 @@ rm -rf cyrus-sasl-$VERSION tar xvf $CWD/cyrus-sasl-$VERSION.tar.?z* || exit 1 cd cyrus-sasl-$VERSION || exit 1 -# Fix compiling: -zcat $CWD/cyrus-sasl.bad_elif.diff.gz | patch -p1 --verbose || exit 1 - # Fix for glibc-2.17 crypt() NULL return: -zcat $CWD/cyrus-sasl-2.1.23-glibc217-crypt.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/cyrus-sasl-2.1.26-null-crypt.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/cyrus-sasl-2.1.26-size_t.patch.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . -perm 777 -exec chmod 755 {} \; |