termux_error_exit "Unsupported arch: $TERMUX_ARCH"
fi
- local TERMUX_GO_VERSION=go1.7.4
+ local TERMUX_GO_VERSION=go1.8rc1
local TERMUX_GO_PLATFORM=linux-amd64
test "$(uname)" = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64
# Utility function for cmake-built packages to setup a current cmake.
termux_setup_cmake() {
local TERMUX_CMAKE_MAJORVESION=3.7
- local TERMUX_CMAKE_MINORVERSION=1
+ local TERMUX_CMAKE_MINORVERSION=2
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
if [ ! -d $TERMUX_CMAKE_FOLDER ]; then
termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
$TERMUX_CMAKE_TARFILE \
- 7b4b7a1d9f314f45722899c0521c261e4bfab4a6b532609e37fef391da6bade2
+ 0e6ec35d4fa9bf79800118916b51928b6471d5725ff36f1d0de5ebb34dcd5406
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_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/toolchain-${TERMUX_ARCH}-ndk${TERMUX_NDK_VERSION}-api${TERMUX_API_LEVEL}"
# Bump the below version if a change is made in toolchain setup to ensure
# that everyone gets an updated toolchain:
- TERMUX_STANDALONE_TOOLCHAIN+="-v4"
+ TERMUX_STANDALONE_TOOLCHAIN+="-v6"
export TERMUX_TAR="tar"
export TERMUX_TOUCH="touch"
# Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR:
TERMUX_PKG_HOSTBUILD=""
TERMUX_PKG_MAINTAINER="Fredrik Fornwall @fornwall"
- TERMUX_PKG_CLANG=no
+ TERMUX_PKG_CLANG=yes # does nothing for cmake based packages. clang is chosen by cmake
+ TERMUX_PKG_FORCE_CMAKE=no # if the package has autotools as well as cmake, then set this to prefer cmake
unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
}
export CXX=$TERMUX_HOST_PLATFORM-g++
_SPECSFLAG=" -specs=$TERMUX_SCRIPTDIR/termux.spec"
else
- export AS=${TERMUX_HOST_PLATFORM}-gcc
+ export AS=${TERMUX_HOST_PLATFORM}-clang
export CC=$TERMUX_HOST_PLATFORM-clang
export CXX=$TERMUX_HOST_PLATFORM-clang++
# TODO: clang does not have specs file, how to ensure pie
if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
# Do not put toolchain in place until we are done with setup, to avoid having a half setup
# toolchain left in place if something goes wrong (or process is just aborted):
- _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp
+ local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp
rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR
local _NDK_ARCHNAME=$TERMUX_ARCH
elif [ "$TERMUX_ARCH" = "i686" ]; then
_NDK_ARCHNAME=x86
fi
+
"$NDK/build/tools/make_standalone_toolchain.py" \
--api "$TERMUX_API_LEVEL" \
--arch $_NDK_ARCHNAME \
--install-dir $_TERMUX_TOOLCHAIN_TMPDIR
+ local w
+ for w in ${TERMUX_ARCH}-linux-android-clang clang; do
+ cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
+ sed -i 's/COMPILER/clang38/' $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
+ sed -i "s/TERMUX_ARCH/$TERMUX_ARCH/" $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w
+ cp $TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
+ sed -i 's/COMPILER/clang38++/' $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
+ sed -i "s/TERMUX_ARCH/$TERMUX_ARCH/" $_TERMUX_TOOLCHAIN_TMPDIR/bin/$w++
+ done
+
if [ "$TERMUX_ARCH" = "arm" ]; then
# Fix to allow e.g. <bits/c++config.h> to be included:
cp $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/arm-linux-androideabi/armv7-a/bits/* \
return
}
-termux_step_configure() {
+termux_step_configure_autotools () {
if [ ! -e "$TERMUX_PKG_SRCDIR/configure" ]; then return; fi
DISABLE_STATIC="--disable-static"
--libexecdir=$TERMUX_PREFIX/libexec
}
-termux_step_post_configure() {
+termux_step_configure_cmake () {
+ termux_setup_cmake
+
+ if [ -n "$_SPECSFLAG" ]; then
+ CFLAGS=${CFLAGS#$_SPECSFLAG}
+ CXXFLAGS=${CXXFLAGS#$_SPECSFLAG}
+ LDFLAGS=${LDFLAGS#$_SPECSFLAG}
+ fi
+
+ local TOOLCHAIN_ARGS="-DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TERMUX_STANDALONE_TOOLCHAIN"
+ local BUILD_TYPE=MinSizeRel
+ test -n "$TERMUX_DEBUG" && BUILD_TYPE=Debug
+
+ local CMAKE_PROC=$TERMUX_ARCH
+ test $CMAKE_PROC == "arm" && CMAKE_PROC='armv7-a'
+
+ # XXX: CMAKE_{AR,RANLIB} needed for at least jsoncpp build to not
+ # pick up cross compiled binutils tool in $PREFIX/bin:
+ cmake -G 'Unix Makefiles' $TERMUX_PKG_SRCDIR \
+ -DCMAKE_AR=`which $AR` \
+ -DCMAKE_RANLIB=`which $RANLIB` \
+ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+ -DCMAKE_CROSSCOMPILING=True \
+ -DCMAKE_C_FLAGS="$CFLAGS $CPPFLAGS" \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS $CPPFLAGS" \
+ -DCMAKE_LINKER="$TERMUX_STANDALONE_TOOLCHAIN/bin/$LD $LDFLAGS" \
+ -DCMAKE_FIND_ROOT_PATH=$TERMUX_PREFIX \
+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+ -DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
+ -DCMAKE_MAKE_PROGRAM=`which make` \
+ -DCMAKE_SYSTEM_PROCESSOR=$CMAKE_PROC \
+ -DCMAKE_SYSTEM_NAME=Android \
+ -DCMAKE_SYSTEM_VERSION=21 \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
+ -DCMAKE_USE_SYSTEM_LIBRARIES=True \
+ -DBUILD_TESTING=OFF \
+ $TERMUX_PKG_EXTRA_CONFIGURE_ARGS $TOOLCHAIN_ARGS
+}
+
+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
+ fi
+}
+
+termux_step_post_configure () {
return
}
if [ -z "$TERMUX_PKG_EXTRA_MAKE_ARGS" ]; then
make -j $TERMUX_MAKE_PROCESSES
else
- make -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_MAKE_ARGS}
+ make -j $TERMUX_MAKE_PROCESSES ${TERMUX_PKG_EXTRA_MAKE_ARGS}
fi
fi
}