From 55e037366d9f72b0b0250637c8cf97484d424936 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Tue, 26 Feb 2019 21:35:27 +0100 Subject: [PATCH] build-package: mv termux_setup_cmake to scripts/build/setup --- build-package.sh | 20 +------------------- scripts/build/setup/termux_setup_cmake.sh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 scripts/build/setup/termux_setup_cmake.sh diff --git a/build-package.sh b/build-package.sh index ccaea330a..69b877b96 100755 --- a/build-package.sh +++ b/build-package.sh @@ -22,25 +22,7 @@ source scripts/build/setup/termux_setup_ninja.sh source scripts/build/setup/termux_setup_meson.sh # Utility function to setup a current cmake build system -termux_setup_cmake() { - local TERMUX_CMAKE_MAJORVESION=3.13 - local TERMUX_CMAKE_MINORVERSION=4 - local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION - local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz - local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME - local TERMUX_CMAKE_FOLDER=$TERMUX_COMMON_CACHEDIR/cmake-$TERMUX_CMAKE_VERSION - if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then - termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ - "$TERMUX_CMAKE_TARFILE" \ - 563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76 - rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" - tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" - mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ - "$TERMUX_CMAKE_FOLDER" - fi - export PATH=$TERMUX_CMAKE_FOLDER/bin:$PATH - export CMAKE_INSTALL_ALWAYS=1 -} +source scripts/build/setup/termux_setup_cmake.sh # First step is to handle command-line arguments. Not to be overridden by packages. termux_step_handle_arguments() { diff --git a/scripts/build/setup/termux_setup_cmake.sh b/scripts/build/setup/termux_setup_cmake.sh new file mode 100644 index 000000000..bcbc385b1 --- /dev/null +++ b/scripts/build/setup/termux_setup_cmake.sh @@ -0,0 +1,19 @@ +termux_setup_cmake() { + local TERMUX_CMAKE_MAJORVESION=3.13 + local TERMUX_CMAKE_MINORVERSION=4 + local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION + local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64.tar.gz + local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME + local TERMUX_CMAKE_FOLDER=$TERMUX_COMMON_CACHEDIR/cmake-$TERMUX_CMAKE_VERSION + if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then + termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \ + "$TERMUX_CMAKE_TARFILE" \ + 563a39e0a7c7368f81bfa1c3aff8b590a0617cdfe51177ddc808f66cc0866c76 + rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" + tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR" + mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-Linux-x86_64" \ + "$TERMUX_CMAKE_FOLDER" + fi + export PATH=$TERMUX_CMAKE_FOLDER/bin:$PATH + export CMAKE_INSTALL_ALWAYS=1 +}