From 9155acd04029e648cc711d1ddf8a41491e62fa24 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 12 May 2021 16:37:17 +0200 Subject: [PATCH] termux_step_configure_cmake: set CMAKE_INSTALL_LIBDIR Some packages seem to need it, but maybe just when building outside docker image? Set in termux_step_configure_cmake instead of in individual build recipes. %ci:no-build --- packages/c-toxcore/build.sh | 2 -- packages/cmark/build.sh | 1 - packages/libjasper/build.sh | 1 - scripts/build/configure/termux_step_configure_cmake.sh | 1 + 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/c-toxcore/build.sh b/packages/c-toxcore/build.sh index 5ae2c1374..18e6432ff 100644 --- a/packages/c-toxcore/build.sh +++ b/packages/c-toxcore/build.sh @@ -11,8 +11,6 @@ TERMUX_PKG_BREAKS="c-toxcore-dev" TERMUX_PKG_REPLACES="c-toxcore-dev" #TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --DCMAKE_INSTALL_PREFIX=${TERMUX_PREFIX} --DCMAKE_INSTALL_LIBDIR=${TERMUX_PREFIX}/lib -DBOOTSTRAP_DAEMON=off -DDHT_BOOTSTRAP=off -DBUILD_TOXAV=off diff --git a/packages/cmark/build.sh b/packages/cmark/build.sh index 4c50e6f3e..3106461c5 100644 --- a/packages/cmark/build.sh +++ b/packages/cmark/build.sh @@ -8,4 +8,3 @@ TERMUX_PKG_SHA256=6c7d2bcaea1433d977d8fed0b55b71c9d045a7cdf616e3cd2dce9007da753d TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_BREAKS="cmark-dev" TERMUX_PKG_REPLACES="cmark-dev" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_INSTALL_LIBDIR=$TERMUX_PREFIX/lib" diff --git a/packages/libjasper/build.sh b/packages/libjasper/build.sh index 027acb83b..bf6be644d 100644 --- a/packages/libjasper/build.sh +++ b/packages/libjasper/build.sh @@ -13,5 +13,4 @@ TERMUX_PKG_REPLACES="libjasper-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -H$TERMUX_PKG_SRCDIR -B$TERMUX_PKG_BUILDDIR --DCMAKE_INSTALL_LIBDIR=$TERMUX_PREFIX/lib " diff --git a/scripts/build/configure/termux_step_configure_cmake.sh b/scripts/build/configure/termux_step_configure_cmake.sh index 8d3cafe32..0e6f01d81 100644 --- a/scripts/build/configure/termux_step_configure_cmake.sh +++ b/scripts/build/configure/termux_step_configure_cmake.sh @@ -40,6 +40,7 @@ termux_step_configure_cmake() { -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \ + -DCMAKE_INSTALL_LIBDIR=$TERMUX_PREFIX/lib \ -DCMAKE_MAKE_PROGRAM=$MAKE_PROGRAM_PATH \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DCMAKE_USE_SYSTEM_LIBRARIES=True \