X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/4e51e8d8bae920159f5a76f2b1be34ed0aa0e062..79d117f0e7966ca5c131169081bbcceb1b74a46d:/packages/jsoncpp/build.sh

diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh
index b384d01c..8827e6b4 100644
--- a/packages/jsoncpp/build.sh
+++ b/packages/jsoncpp/build.sh
@@ -1,33 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
-TERMUX_PKG_VERSION=1.7.4
+TERMUX_PKG_VERSION=1.8.3
+TERMUX_PKG_SHA256=3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f
 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION}
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+-DBUILD_SHARED_LIBS=ON
+-DJSONCPP_WITH_TESTS=OFF
+-DCCACHE_FOUND=OFF
+"
 
-termux_step_configure () {
-        # The installation does not overwrite symlinks such as libjsoncpp.so.1,
-        # so if rebuilding these are not detected as modified. Fix that:
-        rm -f $TERMUX_PREFIX/lib/libjsoncpp.so*
-
-	cd $TERMUX_PKG_BUILDDIR
-	cmake -G "Unix Makefiles" .. \
-		-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
-                -DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_CROSSCOMPILING=True \
-		-DCMAKE_C_FLAGS="$CFLAGS $CPPFLAGS" \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_FIND_ROOT_PATH=$TERMUX_PREFIX \
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-		-DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
-		-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
-                -DCMAKE_MAKE_PROGRAM=`which make` \
-		-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
-		-DCMAKE_SYSTEM_NAME=Android \
-                -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
-		-DZLIB_LIBRARY:FILEPATH="$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/libz.so" \
-		-DZLIB_INCLUDE_DIR:PATH="$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include" \
-		-DBUILD_SHARED_LIBS=ON \
-		-DJSONCPP_WITH_TESTS=OFF \
-		$TERMUX_PKG_SRCDIR
+termux_step_pre_configure () {
+	# The installation does not overwrite symlinks such as libjsoncpp.so.1,
+	# so if rebuilding these are not detected as modified. Fix that:
+	rm -f $TERMUX_PREFIX/lib/libjsoncpp.so*
 }