sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

termux_step_configure_cmake: set CMAKE_INSTALL_LIBDIR

Browse Source 
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
This commit is contained in:
Henrik Grimler 2021-05-12 16:37:17 +02:00
parent 7e15829077
commit 9155acd040
4 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/c-toxcore/build.sh
View File

@ -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

1
packages/cmark/build.sh
View File

@ -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"

1
packages/libjasper/build.sh
View File

@ -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
"

1
scripts/build/configure/termux_step_configure_cmake.sh
View File

@ -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 \