diff options
Diffstat (limited to 'source/d/subversion/subversion.SlackBuild')
| -rwxr-xr-x | source/d/subversion/subversion.SlackBuild | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 114b1197..1df80312 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ 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 ) ;; @@ -36,8 +36,8 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -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" @@ -73,6 +73,7 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-apache-libexecdir=/usr/lib${LIBDIRSUFFIX}/httpd/modules \ --mandir=/usr/man \ --docdir=/usr/doc/subversion-$VERSION \ --enable-shared \ @@ -80,16 +81,11 @@ CFLAGS="$SLKCFLAGS" \ --with-apr=/usr \ --with-apr-util=/usr \ --with-apxs=/usr/bin/apxs \ - --with-neon=/usr \ --with-zlib=/usr \ --with-pic \ - --with-ssl \ + --with-kwallet \ --build=$ARCH-slackware-linux -# Not currently compiling with gcc-4.7.1, but we'll try it again later: -# --with-kwallet \ -# - make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 make install-tools DESTDIR=$PKG || exit 1 |