diff options
Diffstat (limited to 'source/d/git/git.SlackBuild')
| -rwxr-xr-x | source/d/git/git.SlackBuild | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/d/git/git.SlackBuild b/source/d/git/git.SlackBuild index 5130525b..3a947c59 100755 --- a/source/d/git/git.SlackBuild +++ b/source/d/git/git.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "} # 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 ) ;; @@ -40,16 +40,16 @@ eval $(perl '-V:installvendorlib') PERLDIR=$installvendorlib/$ARCH-linux-thread-multi/auto if ls /var/log/packages/git-* 1> /dev/null 2> /dev/null ; then - echo "Git is installed. The package should be removed before" - echo "building, or the new package might be missing some" - echo "perl modules." + echo "The git package needs to be removed before building to ensure that" + echo "the perl modules are included in the new package." echo - echo "You'll be given a short time to consider this." - sleep 3600 + echo "Removing the git package in 15 seconds, and then continuing with the build." + sleep 15 + removepkg git fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then |