diff options
| author | David Spencer <baildon.research@googlemail.com> | 2013-11-18 12:56:28 +0000 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2013-11-19 01:10:15 -0600 |
| commit | d22b1f95df0f73de5e97294963056e2b68e25636 (patch) | |
| tree | 101c0863c6c0a826b038950e5cafcc8211f90332 | |
| parent | 30cdf2fd340a7198e21cce962c421ebf0bfb0600 (diff) | |
development/JSONObject: Updated for version 1.0.2.
Fixed github source download and extract.
Fixed linking against boost-1.54.
Removed unused cmake variables.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/JSONObject/JSONObject.SlackBuild | 19 | ||||
| -rw-r--r-- | development/JSONObject/JSONObject.info | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/development/JSONObject/JSONObject.SlackBuild b/development/JSONObject/JSONObject.SlackBuild index 31723deb58da8..17769bca2a148 100644 --- a/development/JSONObject/JSONObject.SlackBuild +++ b/development/JSONObject/JSONObject.SlackBuild @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=JSONObject -SRCNAM=json -VERSION=${VERSION:-1.0.1} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,9 +59,13 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION +if [ -f $CWD/v$VERSION.tar.gz ]; then + tar xvf $CWD/v$VERSION.tar.gz +else + tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +fi +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,17 +75,15 @@ find . \ mkdir -p build cd build + LDFLAGS="-lboost_system" \ cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_MAN_DIR=man \ -DBUILD_SHARED_LIBS=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ .. - make + make VERBOSE=1 make install DESTDIR=$PKG cd .. diff --git a/development/JSONObject/JSONObject.info b/development/JSONObject/JSONObject.info index ce72a3c9b0a24..310d2b88fba5c 100644 --- a/development/JSONObject/JSONObject.info +++ b/development/JSONObject/JSONObject.info @@ -1,8 +1,8 @@ PRGNAM="JSONObject" -VERSION="1.0.1" +VERSION="1.0.2" HOMEPAGE="https://github.com/mariolpantunes/json" -DOWNLOAD="https://github.com/mariolpantunes/json/archive/v1.0.1.tar.gz" -MD5SUM="6dac9a6bb7fe6e1645ed39bc8c50b9fd" +DOWNLOAD="https://github.com/ATNoG/JSONObject/archive/v1.0.2.tar.gz" +MD5SUM="a329aed36a18170511cbadc009d75311" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |