summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Barboza <bmg.andre@gmail.com>2016-12-13 16:48:29 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-12-13 16:48:29 +0700
commit96ff74b0ebefeaa87b947b59960ba22caba369a6 (patch)
tree05f167788b72155a729324aa019229ce06a04390
parente5472d0a1a6d346ebbcbb60a4e665dab09da37c3 (diff)
downloadslackbuilds-96ff74b0ebefeaa87b947b59960ba22caba369a6.tar.gz
libraries/gflags: Updated for version 2.2.0 + new maintainer.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/gflags/gflags.SlackBuild23
-rw-r--r--libraries/gflags/gflags.info10
2 files changed, 16 insertions, 17 deletions
diff --git a/libraries/gflags/gflags.SlackBuild b/libraries/gflags/gflags.SlackBuild
index 06d0bed55d..5798722bdf 100644
--- a/libraries/gflags/gflags.SlackBuild
+++ b/libraries/gflags/gflags.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gflags
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.2.0}
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
@@ -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
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -69,17 +69,16 @@ 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 {} \;
-sed -i "s|LIBRARY_INSTALL_DIR lib|LIBRARY_INSTALL_DIR lib${LIBDIRSUFFIX}|" CMakeLists.txt
-sed -i "s|CONFIG_INSTALL_DIR lib|CONFIG_INSTALL_DIR lib${LIBDIRSUFFIX}|" CMakeLists.txt
-
mkdir -p build
cd build
cmake \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="lib${LIBDIRSUFFIX}" \
- -DBUILD_SHARED_LIBS=ON \
- -DCMAKE_BUILD_TYPE=Release ..
+ -DCMAKE_BUILD_TYPE=Release \
+ -DGFLAGS_LIBRARY_INSTALL_DIR="lib${LIBDIRSUFFIX}" \
+ -DGFLAGS_BUILD_SHARED_LIBS:BOOL=ON \
+ -DREGISTER_BUILD_DIR:BOOL=OFF \
+ -DREGISTER_INSTALL_PREFIX:BOOL=OFF ..
make
make install DESTDIR=$PKG
cd ..
diff --git a/libraries/gflags/gflags.info b/libraries/gflags/gflags.info
index d41832029d..f72af9d1f0 100644
--- a/libraries/gflags/gflags.info
+++ b/libraries/gflags/gflags.info
@@ -1,10 +1,10 @@
PRGNAM="gflags"
-VERSION="2.1.1"
+VERSION="2.2.0"
HOMEPAGE="https://github.com/gflags/gflags"
-DOWNLOAD="http://pkgs.fedoraproject.org/repo/pkgs/gflags/gflags-2.1.1.tar.gz/18acc0ae270672a70a86b33ebbe9761b/gflags-2.1.1.tar.gz"
-MD5SUM="18acc0ae270672a70a86b33ebbe9761b"
+DOWNLOAD="https://github.com/gflags/gflags/archive/v2.2.0/gflags-v2.2.0.tar.gz"
+MD5SUM="b99048d9ab82d8c56e876fb1456c285e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Jack Hunt"
-EMAIL="jackmileshunt[at]gmail.com"
+MAINTAINER="Andre Barboza"
+EMAIL="bmg.andre@gmail.com"