~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
elfutils: Update from 0.166 to 0.167
[termux-packages]
/
packages
/
jsoncpp
/
build.sh
diff --git
a/packages/jsoncpp/build.sh
b/packages/jsoncpp/build.sh
index
f1a69f9
..
b384d01
100644
(file)
--- a/
packages/jsoncpp/build.sh
+++ b/
packages/jsoncpp/build.sh
@@
-1,10
+1,14
@@
TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
-TERMUX_PKG_VERSION=1.
6.5
+TERMUX_PKG_VERSION=1.
7.4
TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION}
termux_step_configure () {
TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION}
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` \
cd $TERMUX_PKG_BUILDDIR
cmake -G "Unix Makefiles" .. \
-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
@@
-19,7
+23,7
@@
termux_step_configure () {
-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
-DCMAKE_MAKE_PROGRAM=`which make` \
-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
-DCMAKE_MAKE_PROGRAM=`which make` \
-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
- -DCMAKE_SYSTEM_NAME=
Linux
\
+ -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" \
-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" \