From 46f4e306fd833815367a17774dcccbcc2356a22b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 27 Feb 2019 19:49:12 +0100 Subject: [PATCH] build-package: mv termux_step_configure to scripts/build/configure/ --- build-package.sh | 11 ++--------- scripts/build/configure/termux_step_configure.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 scripts/build/configure/termux_step_configure.sh diff --git a/build-package.sh b/build-package.sh index a073e2c9e1..2961b69ec5 100755 --- a/build-package.sh +++ b/build-package.sh @@ -84,15 +84,8 @@ source scripts/build/configure/termux_step_configure_cmake.sh # Setup configure args and run meson. This function is called from termux_step_configure source scripts/build/configure/termux_step_configure_meson.sh -termux_step_configure() { - if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then - termux_step_configure_autotools - elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then - termux_step_configure_cmake - elif [ -f "$TERMUX_PKG_SRCDIR/meson.build" ]; then - termux_step_configure_meson - fi -} +# Configure the package +source scripts/build/configure/termux_step_configure.sh termux_step_post_configure() { return diff --git a/scripts/build/configure/termux_step_configure.sh b/scripts/build/configure/termux_step_configure.sh new file mode 100644 index 0000000000..80b5c7a618 --- /dev/null +++ b/scripts/build/configure/termux_step_configure.sh @@ -0,0 +1,9 @@ +termux_step_configure() { + if [ "$TERMUX_PKG_FORCE_CMAKE" == 'no' ] && [ -f "$TERMUX_PKG_SRCDIR/configure" ]; then + termux_step_configure_autotools + elif [ -f "$TERMUX_PKG_SRCDIR/CMakeLists.txt" ]; then + termux_step_configure_cmake + elif [ -f "$TERMUX_PKG_SRCDIR/meson.build" ]; then + termux_step_configure_meson + fi +}