From 8c89992316b48f039e27e289367863a14eb216b6 Mon Sep 17 00:00:00 2001 From: "Edinaldo P. Silva" Date: Wed, 1 Feb 2017 10:43:49 +0000 Subject: ruby/ruby-json: Minor SlackBuild changes. Signed-off-by: David Spencer --- ruby/ruby-json/ruby-json.SlackBuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ruby') diff --git a/ruby/ruby-json/ruby-json.SlackBuild b/ruby/ruby-json/ruby-json.SlackBuild index c2a4f0dba0..59c52d86f8 100644 --- a/ruby/ruby-json/ruby-json.SlackBuild +++ b/ruby/ruby-json/ruby-json.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for ruby-json. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +25,12 @@ PRGNAM=ruby-json SRCNAM=json VERSION=${VERSION:-2.0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,6 +60,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP +rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . @@ -110,6 +111,9 @@ gem install \ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +rm -rf $PKG/$DESTDIR/cache +rm -rf $PKG/$DESTDIR/{build_info,extensions} + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -- cgit v1.2.3