summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2018-11-11 16:23:29 -0800
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-11-17 18:42:54 +0700
commit4e3279f465242f70bb2032f58cd17adf0dd57533 (patch)
tree3c3b3204ef7d792cd4875e1da2b3599adb6b17eb /libraries
parentef8cbe883aa731c4e620e7153a540117806f77c7 (diff)
downloadslackbuilds-4e3279f465242f70bb2032f58cd17adf0dd57533.tar.gz
libraries/jsoncpp: Updated for version 1.8.4
Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/jsoncpp/jsoncpp.SlackBuild34
-rw-r--r--libraries/jsoncpp/jsoncpp.info8
2 files changed, 19 insertions, 23 deletions
diff --git a/libraries/jsoncpp/jsoncpp.SlackBuild b/libraries/jsoncpp/jsoncpp.SlackBuild
index 36b8b366ff..9464b12b76 100644
--- a/libraries/jsoncpp/jsoncpp.SlackBuild
+++ b/libraries/jsoncpp/jsoncpp.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for jsoncpp
-# Copyright 2014-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2014-2018 Larry Hajali <larryhaja[at]gmail[dot]com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=jsoncpp
-VERSION=${VERSION:-1.8.1}
+VERSION=${VERSION:-1.8.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,29 +71,25 @@ find -L . \
mkdir -p build
cd build
- cmake -G "Unix Makefiles" \
- -DCMAKE_INSTALL_PREFIX:PATH="/usr" \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON \
- -DBUILD_STATIC_LIBS:BOOL=OFF \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DJSONCPP_WITH_TESTS:BOOL=OFF \
- -DCMAKE_INSTALL_INCLUDEDIR="/usr/include/$PRGNAM" \
- -DCMAKE_BUILD_TYPE=Release ..
+ CXXFLAGS="$SLKCFLAGS -std=c++11" \
+ meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --bindir=/usr/bin \
+ --includedir=/usr/include/$PRGNAM \
+ --buildtype=release \
+ --default-library=shared \
+ ..
- make VERBOSE=1
- make install DESTDIR=$PKG
-cd -
+ ninja
+ DESTDIR=$PKG ninja install
+cd ..
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
-# Cosmetic fix.
-sed -i '/^includedir/s|\$.*//|/|' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/$PRGNAM.pc
-
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE NEWS.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/jsoncpp/jsoncpp.info b/libraries/jsoncpp/jsoncpp.info
index b5d23b8881..c9404eb748 100644
--- a/libraries/jsoncpp/jsoncpp.info
+++ b/libraries/jsoncpp/jsoncpp.info
@@ -1,10 +1,10 @@
PRGNAM="jsoncpp"
-VERSION="1.8.1"
+VERSION="1.8.4"
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.8.1/jsoncpp-1.8.1.tar.gz"
-MD5SUM="b1815c611fa142e2dcb16459d38cbbe8"
+DOWNLOAD="https://github.com/open-source-parsers/jsoncpp/archive/1.8.4/jsoncpp-1.8.4.tar.gz"
+MD5SUM="fa47a3ab6b381869b6a5f20811198662"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="meson"
MAINTAINER="Larry Hajali"
EMAIL="larryhaja[at]gmail[dot]com"