aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunter Sezen <orbea@fredslev.dk>2018-04-02 19:21:05 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-04-07 08:13:08 +0700
commitde7d5623f10ea146cda58747ab238c62a7369437 (patch)
tree78c3e1590e218ebb63c50a002510c5fc775f89be
parentfbf73bbf0454c16984036805cb4345f5b3140ba7 (diff)
development/ucpp: Minor cleanups.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--development/ucpp/ucpp.SlackBuild15
-rw-r--r--development/ucpp/ucpp.info4
2 files changed, 9 insertions, 10 deletions
diff --git a/development/ucpp/ucpp.SlackBuild b/development/ucpp/ucpp.SlackBuild
index 1592202c7b7d3..f4e6b6d909704 100644
--- a/development/ucpp/ucpp.SlackBuild
+++ b/development/ucpp/ucpp.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for ucpp
-# Copyright 2015 Hunter Sezen California, USA
+# Copyright 2015, 2018 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ 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
@@ -40,8 +40,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"
@@ -54,13 +54,13 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+set -eu
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,8 +69,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-sh autogen.sh
-
+autoreconf -fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/development/ucpp/ucpp.info b/development/ucpp/ucpp.info
index c7bd3a5bec3fb..aee6083f97c73 100644
--- a/development/ucpp/ucpp.info
+++ b/development/ucpp/ucpp.info
@@ -1,10 +1,10 @@
PRGNAM="ucpp"
VERSION="1.3.4"
HOMEPAGE="https://github.com/scarabeusiv/ucpp"
-DOWNLOAD="https://github.com/scarabeusiv/ucpp/archive/1.3.4.tar.gz"
+DOWNLOAD="https://github.com/scarabeusiv/ucpp/archive/1.3.4/ucpp-1.3.4.tar.gz"
MD5SUM="7d169055b45f0f4fb4b91a92a1ef5d5a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Hunter Sezen"
-EMAIL="orbea@fredslev.dk" \ No newline at end of file
+EMAIL="orbea@fredslev.dk"