diff options
Diffstat (limited to 'source/l/imagemagick')
| -rwxr-xr-x | source/l/imagemagick/imagemagick.SlackBuild | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild index c1fb53430..f62ef83d5 100755 --- a/source/l/imagemagick/imagemagick.SlackBuild +++ b/source/l/imagemagick/imagemagick.SlackBuild @@ -48,7 +48,7 @@ POLICY=${POLICY:-limited} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -65,14 +65,11 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +if [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=pentium4 -mtune=generic" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -121,7 +118,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-fftw \ --with-gcc-arch=$ARCH \ --with-perl \ - --with-perl-options="INSTALLDIRS=vendor" \ + --with-perl-options="INSTALLDIRS=vendor INSTALL_BASE=" \ --with-rsvg \ --with-security-policy=$POLICY \ --build=$ARCH-slackware-linux || exit 1 |