diff options
| author |   Eric Hameleers <alien@slackware.com> | 2009-05-20 20:16:23 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2009-05-20 20:16:23 +0000 |
| commit | 62834b980f0c25cfd9f9559f845324a115314cfa (patch) | |
| tree | 4e7601ad5440ed79b20b7fadaa81ef03dd65ebc9 | |
| parent | 5e880b5c344f0e9d4a1212d70ff7581917ba6b1a (diff) | |
| download | asb-62834b980f0c25cfd9f9559f845324a115314cfa.tar.gz asb-62834b980f0c25cfd9f9559f845324a115314cfa.tar.xz | |
Auto-import of Pat's changes after public release of slackware64, Wed May 20 20:16:21 UTC 2009
| -rwxr-xr-x | lcms2/build/lcms.SlackBuild | 8 | ||||
| -rwxr-xr-x | libusbx/build/libusbx.SlackBuild | 5 | ||||
| -rwxr-xr-x | sqlite/build/sqlite.SlackBuild | 11 |
3 files changed, 9 insertions, 15 deletions
diff --git a/lcms2/build/lcms.SlackBuild b/lcms2/build/lcms.SlackBuild index 87edeb07..4510d2cf 100755 --- a/lcms2/build/lcms.SlackBuild +++ b/lcms2/build/lcms.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + VERSION=1.18 ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} - NUMJOBS=${NUMJOBS:-" -j7 "} +BUILD=${BUILD:-1} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -81,5 +81,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/lcms-$VERSION-$ARCH-$BUILD.tgz +/sbin/makepkg -l y -c n $TMP/lcms-$VERSION-$ARCH-$BUILD.txz diff --git a/libusbx/build/libusbx.SlackBuild b/libusbx/build/libusbx.SlackBuild index 3eb0b420..90db52ff 100755 --- a/libusbx/build/libusbx.SlackBuild +++ b/libusbx/build/libusbx.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + VERSION=${VERSION:-0.1.12} ARCH=${ARCH:-x86_64} BUILD=${BUILD:-2} @@ -96,5 +97,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/libusb-$VERSION-$ARCH-$BUILD.tgz +makepkg -l y -c n $TMP/libusb-$VERSION-$ARCH-$BUILD.txz diff --git a/sqlite/build/sqlite.SlackBuild b/sqlite/build/sqlite.SlackBuild index 690e37b0..6f394f79 100755 --- a/sqlite/build/sqlite.SlackBuild +++ b/sqlite/build/sqlite.SlackBuild @@ -24,11 +24,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sqlite -VERSION=${VERSION:-3.6.14} +VERSION=3.6.14 ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} - NUMJOBS=${NUMJOBS:-" -j7 "} +BUILD=${BUILD:-1} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -39,12 +38,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" - LIBDIRSUFFIX="" fi CWD=$(pwd) |