}
# Utility function for golang-using packages to setup a go toolchain.
-termux_setup_golang () {
+termux_setup_golang() {
export GOOS=android
export CGO_ENABLED=1
export GO_LDFLAGS="-extldflags=-pie"
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
( cd "$TERMUX_COMMON_CACHEDIR"; tar xf "$TERMUX_BUILDGO_TAR"; mv go "$TERMUX_BUILDGO_FOLDER"; rm "$TERMUX_BUILDGO_TAR" )
}
+# Utility function for cmake-built packages to setup a current cmake.
+termux_setup_cmake() {
+ local TERMUX_CMAKE_MAJORVESION=3.7
+ 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
+ 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 \
+ 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_CMAKE_FOLDER
+ fi
+ export PATH=$TERMUX_CMAKE_FOLDER/bin:$PATH
+}
+
# First step is to handle command-line arguments. Not to be overridden by packages.
termux_step_handle_arguments() {
# shellcheck source=/dev/null
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"
TERMUX_PKG_HOSTBUILD_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/host-build
TERMUX_PKG_PLATFORM_INDEPENDENT=""
TERMUX_PKG_NO_DEVELSPLIT=""
- TERMUX_PKG_BUILD_REVISION="0" # http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
+ TERMUX_PKG_REVISION="0" # http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=""
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS=""
TERMUX_PKG_EXTRA_MAKE_ARGS=""
# 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
}
fi
TERMUX_PKG_FULLVERSION=$TERMUX_PKG_VERSION
- if [ "$TERMUX_PKG_BUILD_REVISION" != "0" ] || [ "$TERMUX_PKG_FULLVERSION" != "${TERMUX_PKG_FULLVERSION/-/}" ]; then
+ if [ "$TERMUX_PKG_REVISION" != "0" ] || [ "$TERMUX_PKG_FULLVERSION" != "${TERMUX_PKG_FULLVERSION/-/}" ]; then
# "0" is the default revision, so only include it if the upstream versions contains "-" itself
- TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_BUILD_REVISION"
+ TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION"
fi
if [ -z "$TERMUX_DEBUG" ] && [ -e "/data/data/.built-packages/$TERMUX_PKG_NAME" ]; then
}
# Run just after sourcing $TERMUX_PKG_BUILDER_SCRIPT. May be overridden by packages.
-termux_step_extract_package () {
+termux_step_extract_package() {
if [ -z "${TERMUX_PKG_SRCURL:=""}" ]; then
mkdir -p "$TERMUX_PKG_SRCDIR"
return
# Hook for packages to act just after the package has been extracted.
# Invoked in $TERMUX_PKG_SRCDIR.
-termux_step_post_extract_package () {
+termux_step_post_extract_package() {
return
}
# Perform a host build. Will be called in $TERMUX_PKG_HOSTBUILD_DIR.
# After termux_step_post_extract_package() and before termux_step_patch_package()
-termux_step_host_build () {
+termux_step_host_build() {
"$TERMUX_PKG_SRCDIR/configure" ${TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS}
make -j $TERMUX_MAKE_PROCESSES
}
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/* \
}
# Apply all *.patch files for the package. Not to be overridden by packages.
-termux_step_patch_package () {
+termux_step_patch_package() {
cd "$TERMUX_PKG_SRCDIR"
# Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,}; do
}
# For package scripts to override. Called in $TERMUX_PKG_BUILDDIR.
-termux_step_pre_configure () {
+termux_step_pre_configure() {
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_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
}
-termux_step_make () {
+termux_step_make() {
if ls ./*akefile &> /dev/null; then
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
}
-termux_step_make_install () {
+termux_step_make_install() {
if ls ./*akefile &> /dev/null; then
: "${TERMUX_PKG_MAKE_INSTALL_TARGET:="install"}"
# Some packages have problem with parallell install, and it does not buy much, so use -j 1.
}
# Hook function for package scripts to override.
-termux_step_post_make_install () {
+termux_step_post_make_install() {
return
}
-termux_step_extract_into_massagedir () {
+termux_step_extract_into_massagedir() {
local TARBALL_ORIG=$TERMUX_PKG_PACKAGEDIR/${TERMUX_PKG_NAME}_orig.tar.gz
# Build diff tar with what has changed during the build:
rm "$TARBALL_ORIG"
}
-termux_step_massage () {
+termux_step_massage() {
cd "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
# Remove lib/charset.alias which is installed by gettext-using packages:
echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > "$_DEVEL_SUBPACKAGE_FILE"
echo "TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\"" >> "$_DEVEL_SUBPACKAGE_FILE"
if [ -n "$TERMUX_PKG_DEVPACKAGE_DEPENDS" ]; then
- echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME,$TERMUX_PKG_DEVPACKAGE_DEPENDS\" >> $_DEVEL_SUBPACKAGE_FILE
+ echo "TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME,$TERMUX_PKG_DEVPACKAGE_DEPENDS\"" >> $_DEVEL_SUBPACKAGE_FILE
else
- echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> "$_DEVEL_SUBPACKAGE_FILE"
+ echo "TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\"" >> "$_DEVEL_SUBPACKAGE_FILE"
fi
if [ x$TERMUX_PKG_CONFLICTS != x ]; then
# Assume that dev packages conflicts as well.
chmod -R u+rw .
}
-termux_step_post_massage () {
+termux_step_post_massage() {
return
}
$TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" .
}
-termux_step_create_debscripts () {
+termux_step_create_debscripts() {
return
}
~mdw / termux-packages / blobdiff