summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/parallel/README2
-rw-r--r--system/parallel/parallel.SlackBuild8
-rw-r--r--system/parallel/parallel.info6
3 files changed, 9 insertions, 7 deletions
diff --git a/system/parallel/README b/system/parallel/README
index a0b3eedf74..bbee7b2123 100644
--- a/system/parallel/README
+++ b/system/parallel/README
@@ -5,3 +5,5 @@ input is a list of files, a list of hosts, a list of users, a list of
URLs, or a list of tables. A job can also be a command that reads
from a pipe. GNU parallel can then split the input and pipe it into
commands in parallel.
+
+This package conflicts with misc/moreutils.
diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild
index 47ea5cdfe1..4726ceeb92 100644
--- a/system/parallel/parallel.SlackBuild
+++ b/system/parallel/parallel.SlackBuild
@@ -25,13 +25,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=parallel
-VERSION=${VERSION:-20160722}
+VERSION=${VERSION:-20160822}
BUILD=${BUILD:-1}
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
@@ -42,8 +42,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"
diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info
index d097fe9512..34e19784ba 100644
--- a/system/parallel/parallel.info
+++ b/system/parallel/parallel.info
@@ -1,8 +1,8 @@
PRGNAM="parallel"
-VERSION="20160722"
+VERSION="20160822"
HOMEPAGE="http://www.gnu.org/software/parallel/"
-DOWNLOAD="http://ftpmirror.gnu.org/parallel/parallel-20160722.tar.bz2"
-MD5SUM="7c0462c43a93e717766dbe156cf7c24d"
+DOWNLOAD="http://ftpmirror.gnu.org/parallel/parallel-20160822.tar.bz2"
+MD5SUM="bf61c286c4de6d29b3adcbcbb7267385"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""