Pass -DDOXYGEN_EXECUTABLE to cmake for all builds

This avoids cmake picking up a cross-compiled doxygen binary.
7 years ago · 02417dfc2d
4 changed files with 1 additions and 3 deletions
--- a/build-package.sh
+++ b/build-package.sh
@ -976,6 +976,7 @@ termux_step_configure_cmake () {
 		-DCMAKE_SYSTEM_VERSION=$TERMUX_PKG_API_LEVEL \
 		-DCMAKE_SKIP_INSTALL_RPATH=ON \
 		-DCMAKE_USE_SYSTEM_LIBRARIES=True \
+		-DDOXYGEN_EXECUTABLE= \
 		-DBUILD_TESTING=OFF \
 		$TERMUX_PKG_EXTRA_CONFIGURE_ARGS $TOOLCHAIN_ARGS
 }
--- a/packages/libjasper/build.sh
+++ b/packages/libjasper/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_SHA256=85266eea728f8b14365db9eaf1edc7be4c348704e562bb05095b9a077cf1a9
 TERMUX_PKG_SRCURL=https://github.com/mdadams/jasper/archive/version-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libjpeg-turbo"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DDOXYGEN_EXECUTABLE=
 -H$TERMUX_PKG_SRCDIR
 -B$TERMUX_PKG_BUILDDIR
 "
--- a/packages/libmsgpack/build.sh
+++ b/packages/libmsgpack/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_SHA256=2ca2d36672927d7d353927c50be0a06434c0f0fcb9d96ffa0165d9ce40665a
 TERMUX_PKG_SRCURL=https://github.com/msgpack/msgpack-c/releases/download/cpp-${TERMUX_PKG_VERSION}/msgpack-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DDOXYGEN_EXECUTABLE=
 -DMSGPACK_BUILD_EXAMPLES=OFF
 -DMSGPACK_BUILD_TESTS=OFF
 -DMSGPACK_ENABLE_CXX=OFF
--- a/packages/libssh/build.sh
+++ b/packages/libssh/build.sh
@ -5,7 +5,6 @@ TERMUX_PKG_SHA256=1f5bb2c64a757a11959c22556493c6e31ea17aacd7d61e6e181692cca05686
 TERMUX_PKG_SRCURL=https://git.libssh.org/projects/libssh.git/snapshot/libssh-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DDOXYGEN_EXECUTABLE=
 -DHAVE_ARGP_H=OFF
 -DWITH_GSSAPI=OFF
 "