termux_error_exit "Unsupported arch: $TERMUX_ARCH"
fi
- local TERMUX_GO_VERSION=go1.8.1
+ local TERMUX_GO_VERSION=go1.9.2
local TERMUX_GO_PLATFORM=linux-amd64
local TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}
rm -Rf "$TERMUX_COMMON_CACHEDIR/go" "$TERMUX_BUILDGO_FOLDER"
termux_download https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz \
"$TERMUX_BUILDGO_TAR" \
- a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994
+ de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
( 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.
+# Utility function to setup a current ninja build system.
+termux_setup_ninja() {
+ local NINJA_VERSION=1.8.2
+ local NINJA_FOLDER=$TERMUX_COMMON_CACHEDIR/ninja-$NINJA_VERSION
+ if [ ! -x $NINJA_FOLDER/ninja ]; then
+ mkdir -p $NINJA_FOLDER
+ local NINJA_ZIP_FILE=$TERMUX_PKG_TMPDIR/ninja-$NINJA_VERSION.zip
+ termux_download https://github.com/ninja-build/ninja/releases/download/v$NINJA_VERSION/ninja-linux.zip \
+ $NINJA_ZIP_FILE \
+ d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07
+ unzip $NINJA_ZIP_FILE -d $NINJA_FOLDER
+ fi
+ export PATH=$NINJA_FOLDER:$PATH
+}
+
+# Utility function to setup a current meson build system.
+termux_setup_meson() {
+ termux_setup_ninja
+ local MESON_VERSION=0.43.0
+ local MESON_FOLDER=$TERMUX_COMMON_CACHEDIR/meson-$MESON_VERSION
+ if [ ! -d "$MESON_FOLDER" ]; then
+ local MESON_TAR_NAME=meson-$MESON_VERSION.tar.gz
+ local MESON_TAR_FILE=$TERMUX_PKG_TMPDIR/$MESON_TAR_NAME
+ termux_download \
+ https://github.com/mesonbuild/meson/releases/download/$MESON_VERSION/meson-$MESON_VERSION.tar.gz \
+ $MESON_TAR_FILE \
+ c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340
+ tar xf "$MESON_TAR_FILE" -C "$TERMUX_COMMON_CACHEDIR"
+ (cd $MESON_FOLDER && patch -p1 < $TERMUX_SCRIPTDIR/scripts/meson-android.patch)
+ fi
+ TERMUX_MESON="$MESON_FOLDER/meson.py"
+ TERMUX_MESON_CROSSFILE=$TERMUX_COMMON_CACHEDIR/meson-crossfile-$TERMUX_ARCH-v2.txt
+ if [ ! -f $TERMUX_MESON_CROSSFILE ]; then
+ local MESON_CPU MESON_CPU_FAMILY
+ if [ $TERMUX_ARCH = "arm" ]; then
+ MESON_CPU_FAMILY="arm"
+ MESON_CPU="armv7"
+ elif [ $TERMUX_ARCH = "i686" ]; then
+ MESON_CPU_FAMILY="x86"
+ MESON_CPU="i686"
+ elif [ $TERMUX_ARCH = "x86_64" ]; then
+ MESON_CPU_FAMILY="x86_64"
+ MESON_CPU="x86_64"
+ elif [ $TERMUX_ARCH = "aarch64" ]; then
+ MESON_CPU_FAMILY="arm"
+ MESON_CPU="aarch64"
+ else
+ termux_error_exit "Unsupported arch: $TERMUX_ARCH"
+ fi
+
+ cat > $TERMUX_MESON_CROSSFILE <<-HERE
+ [binaries]
+ ar = '$AR'
+ c = '$CC'
+ cpp = '$CXX'
+ ld = '$LD'
+ pkgconfig = '$PKG_CONFIG'
+ strip = '$STRIP'
+ [properties]
+ needs_exe_wrapper = true
+ [host_machine]
+ cpu_family = '$MESON_CPU_FAMILY'
+ cpu = '$MESON_CPU'
+ endian = 'little'
+ system = 'android'
+ HERE
+ fi
+}
+
+# Utility function to setup a current cmake build system
termux_setup_cmake() {
- local TERMUX_CMAKE_MAJORVESION=3.8
- local TERMUX_CMAKE_MINORVERSION=1
+ local TERMUX_CMAKE_MAJORVESION=3.9
+ local TERMUX_CMAKE_MINORVERSION=6
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" \
- 10ca0e25b7159a03da0c1ec627e686562dc2a40aad5985fd2088eb684b08e491
+ 062bf45bee36ce7c2a55ae26b8b5324720f370d420a05cba91b9448c64ffdbea
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" \
# Handle command-line arguments:
_show_usage () {
- echo "Usage: ./build-package.sh [-a ARCH] [-d] [-D] PACKAGE"
+ echo "Usage: ./build-package.sh [-a ARCH] [-d] [-D] [-f] [-q] [-s] PACKAGE"
echo "Build a package by creating a .deb file in the debs/ folder."
echo " -a The architecture to build for: aarch64(default), arm, i686, x86_64 or all."
echo " -d Build with debug symbols."
echo " -D Build a disabled package in disabled-packages/."
echo " -f Force build even if package has already been built."
+ echo " -q Quiet build"
echo " -s Skip dependency check."
exit 1
}
- while getopts :a:hdDfs option; do
+ while getopts :a:hdDfqs option; do
case "$option" in
a) TERMUX_ARCH="$OPTARG";;
h) _show_usage;;
d) TERMUX_DEBUG=true;;
D) local TERMUX_IS_DISABLED=true;;
f) TERMUX_FORCE_BUILD=true;;
+ q) export TERMUX_QUIET_BUILD=true;;
s) export TERMUX_SKIP_DEPCHECK=true;;
?) termux_error_exit "./build-package.sh: illegal option -$OPTARG";;
esac
if [ ! -d "$1" ]; then termux_error_exit "'$1' seems to be a path but is not a directory"; fi
export TERMUX_PKG_BUILDER_DIR
TERMUX_PKG_BUILDER_DIR=$(realpath "$1")
- # Skip depcheck for external package:
- TERMUX_SKIP_DEPCHECK=true
else
# Package name:
if [ -n "${TERMUX_IS_DISABLED=""}" ]; then
: "${TERMUX_PREFIX:="/data/data/com.termux/files/usr"}"
: "${TERMUX_ANDROID_HOME:="/data/data/com.termux/files/home"}"
: "${TERMUX_DEBUG:=""}"
- : "${TERMUX_API_LEVEL:="21"}"
- : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="25.0.1"}"
- : "${TERMUX_NDK_VERSION:="14"}"
+ : "${TERMUX_PKG_API_LEVEL:="21"}"
+ : "${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="27.0.1"}"
+ : "${TERMUX_NDK_VERSION:="16"}"
if [ "x86_64" = "$TERMUX_ARCH" ] || [ "aarch64" = "$TERMUX_ARCH" ]; then
TERMUX_ARCH_BITS=64
# to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from
# the standalone toolchain.
TERMUX_DX=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/dx
- TERMUX_JACK=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jack.jar
- TERMUX_JILL=$ANDROID_HOME/build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/jill.jar
TERMUX_COMMON_CACHEDIR="$TERMUX_TOPDIR/_cache"
TERMUX_DEBDIR="$TERMUX_SCRIPTDIR/debs"
TERMUX_ELF_CLEANER=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner
- 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+="-v17"
-
export prefix=${TERMUX_PREFIX}
export PREFIX=${TERMUX_PREFIX}
- export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
TERMUX_PKG_BUILDDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/build
TERMUX_PKG_CACHEDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/cache
TERMUX_PKG_EXTRA_MAKE_ARGS=""
TERMUX_PKG_BUILD_IN_SRC=""
TERMUX_PKG_RM_AFTER_INSTALL=""
+ TERMUX_PKG_BREAKS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
TERMUX_PKG_DEPENDS=""
+ TERMUX_PKG_BUILD_DEPENDS=""
TERMUX_PKG_HOMEPAGE=""
TERMUX_PKG_DESCRIPTION="FIXME:Add description"
- TERMUX_PKG_FOLDERNAME=""
TERMUX_PKG_KEEP_STATIC_LIBRARIES="false"
TERMUX_PKG_ESSENTIAL=""
TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
+ TERMUX_PKG_RECOMMENDS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-binarydeps
TERMUX_PKG_REPLACES=""
TERMUX_PKG_CONFFILES=""
TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=""
if test -e "$TERMUX_DATA_PREVIOUS_BACKUPDIR"; then
termux_error_exit "Directory already exists"
fi
- mv /data/data "$TERMUX_DATA_PREVIOUS_BACKUPDIR"
+ if [ -d /data/data ]; then
+ mv /data/data "$TERMUX_DATA_PREVIOUS_BACKUPDIR"
+ fi
# Restore new one (if any)
if [ -d "$TERMUX_DATA_CURRENT_BACKUPDIR" ]; then
mv "$TERMUX_DATA_CURRENT_BACKUPDIR" /data/data
# shellcheck source=/dev/null
source "$TERMUX_PKG_BUILDER_SCRIPT"
+ TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_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+="-v2"
+
if [ -n "${TERMUX_PKG_BLACKLISTED_ARCHES:=""}" ] && [ "$TERMUX_PKG_BLACKLISTED_ARCHES" != "${TERMUX_PKG_BLACKLISTED_ARCHES/$TERMUX_ARCH/}" ]; then
echo "Skipping building $TERMUX_PKG_NAME for arch $TERMUX_ARCH"
exit 0
if [ -z "${TERMUX_SKIP_DEPCHECK:=""}" ]; then
local p TERMUX_ALL_DEPS
- TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_NAME")
+ TERMUX_ALL_DEPS=$(./scripts/buildorder.py "$TERMUX_PKG_BUILDER_DIR")
for p in $TERMUX_ALL_DEPS; do
- if [ "$p" != "$TERMUX_PKG_NAME" ]; then
- echo "Building dependency $p if necessary..."
- ./build-package.sh -a $TERMUX_ARCH -s "$p"
- fi
+ echo "Building dependency $p if necessary..."
+ ./build-package.sh -a $TERMUX_ARCH -s "$p"
done
fi
"$TERMUX_PKG_TMPDIR" \
"$TERMUX_PKG_CACHEDIR" \
"$TERMUX_PKG_MASSAGEDIR" \
- $PKG_CONFIG_LIBDIR \
$TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp,include}
# Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build
termux_download \
https://raw.githubusercontent.com/termux/termux-elf-cleaner/v$TERMUX_ELF_CLEANER_VERSION/termux-elf-cleaner.cpp \
$TERMUX_ELF_CLEANER_SRC \
- 11a38372f4d0e36b7556382c7ecffecae35cee8b68daaee2dbee025f758e17ee
+ 62c3cf9813756a1b262108fbc39684c5cfd3f9a69b376276bb1ac6af138f5fa2
if [ "$TERMUX_ELF_CLEANER_SRC" -nt "$TERMUX_ELF_CLEANER" ]; then
g++ -std=c++11 -Wall -Wextra -pedantic -Os "$TERMUX_ELF_CLEANER_SRC" -o "$TERMUX_ELF_CLEANER"
fi
echo "termux - building $TERMUX_PKG_NAME for arch $TERMUX_ARCH..."
test -t 1 && printf "\033]0;%s...\007" "$TERMUX_PKG_NAME"
- # Add a pkg-config file for the system zlib
- cat > "$PKG_CONFIG_LIBDIR/zlib.pc" <<-HERE
+ # Avoid exporting PKG_CONFIG_LIBDIR until after termux_step_host_build.
+ export TERMUX_PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig
+ # Add a pkg-config file for the system zlib.
+ mkdir -p "$TERMUX_PKG_CONFIG_LIBDIR"
+ cat > "$TERMUX_PKG_CONFIG_LIBDIR/zlib.pc" <<-HERE
Name: zlib
Description: zlib compression library
Version: 1.2.8
local file="$TERMUX_PKG_CACHEDIR/$filename"
termux_download "$TERMUX_PKG_SRCURL" "$file" "$TERMUX_PKG_SHA256"
- if [ "x$TERMUX_PKG_FOLDERNAME" = "x" ]; then
- folder=`basename $filename .tar.bz2` && folder=`basename $folder .tar.gz` && folder=`basename $folder .tar.xz` && folder=`basename $folder .tar.lz` && folder=`basename $folder .tgz` && folder=`basename $folder .zip`
- folder="${folder/_/-}" # dpkg uses _ in tar filename, but - in folder
- else
- folder=$TERMUX_PKG_FOLDERNAME
- fi
- rm -Rf $folder
+ local folder
+ set +o pipefail
if [ "${file##*.}" = zip ]; then
+ folder=`unzip -qql "$file" | head -n1 | tr -s ' ' | cut -d' ' -f5-`
+ rm -Rf $folder
unzip -q "$file"
+ mv $folder "$TERMUX_PKG_SRCDIR"
else
- tar xf "$file"
+ mkdir "$TERMUX_PKG_SRCDIR"
+ tar xf "$file" -C "$TERMUX_PKG_SRCDIR" --strip-components=1
fi
- mv $folder "$TERMUX_PKG_SRCDIR"
+ set -o pipefail
}
# Hook for packages to act just after the package has been extracted.
# "We recommend using the -mthumb compiler flag to force the generation of 16-bit Thumb-2 instructions".
# With r13 of the ndk ruby 2.4.0 segfaults when built on arm with clang without -mthumb.
CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb"
- LDFLAGS+=" -march=armv7-a -Wl,--fix-cortex-a8"
+ LDFLAGS+=" -march=armv7-a"
elif [ "$TERMUX_ARCH" = "i686" ]; then
# From $NDK/docs/CPU-ARCH-ABIS.html:
CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse"
if [ -n "$TERMUX_DEBUG" ]; then
CFLAGS+=" -g3 -O1 -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
else
- CFLAGS+=" -Os"
+ if [ "$TERMUX_PKG_CLANG" = "no" ]; then
+ CFLAGS+=" -Os"
+ else
+ if [ "$TERMUX_PKG_NAME" = "ruby" -a "$TERMUX_ARCH" = arm ]; then
+ # This exception is to avoid a broken ruby on 32-bit arm
+ # with NDK r15c and ruby 2.4.2 - see #1520.
+ CFLAGS+=" -O1"
+ else
+ # -Oz seems good for clang, see https://github.com/android-ndk/ndk/issues/133
+ CFLAGS+=" -Oz"
+ fi
+ fi
fi
export CXXFLAGS="$CFLAGS"
export ac_cv_func_getpwent=no
export ac_cv_func_getpwnam=no
export ac_cv_func_getpwuid=no
+ export ac_cv_func_sigsetmask=no
if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
# Do not put toolchain in place until we are done with setup, to avoid having a half setup
fi
"$NDK/build/tools/make_standalone_toolchain.py" \
- --api "$TERMUX_API_LEVEL" \
+ --api "$TERMUX_PKG_API_LEVEL" \
--arch $_NDK_ARCHNAME \
+ --stl=libc++ \
--install-dir $_TERMUX_TOOLCHAIN_TMPDIR
+ # Remove android-support header wrapping not needed on android-21:
+ rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local
+
local wrapped plusplus CLANG_TARGET=$TERMUX_HOST_PLATFORM
if [ $TERMUX_ARCH = arm ]; then CLANG_TARGET=${CLANG_TARGET/arm-/armv7a-}; fi
for wrapped in ${TERMUX_HOST_PLATFORM}-clang clang; do
termux_error_exit "No toolchain file to override: $FILE_TO_REPLACE"
fi
cp "$TERMUX_SCRIPTDIR/scripts/clang-pie-wrapper" $FILE_TO_REPLACE
- sed -i "s/COMPILER/clang38$plusplus/" $FILE_TO_REPLACE
+ sed -i "s/COMPILER/clang50$plusplus/" $FILE_TO_REPLACE
sed -i "s/CLANG_TARGET/$CLANG_TARGET/" $FILE_TO_REPLACE
done
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/* \
- $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x/bits
- elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+ if [ "$TERMUX_ARCH" = "aarch64" ]; then
# Use gold by default to work around https://github.com/android-ndk/ndk/issues/148
cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \
$_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld
$_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld
fi
+ if [ "$TERMUX_ARCH" = "arm" ]; then
+ # Linker wrapper script to add '--exclude-libs libgcc.a', see
+ # https://github.com/android-ndk/ndk/issues/379
+ # https://android-review.googlesource.com/#/c/389852/
+ local linker
+ for linker in ld ld.bfd ld.gold; do
+ local wrap_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker
+ local real_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker.real
+ cp $wrap_linker $real_linker
+ echo '#!/bin/bash' > $wrap_linker
+ echo -n '`dirname $0`/' >> $wrap_linker
+ echo -n $linker.real >> $wrap_linker
+ echo ' --exclude-libs libgcc.a "$@"' >> $wrap_linker
+ done
+ fi
+
cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot
- for f in $TERMUX_SCRIPTDIR/ndk_patches/*.patch; do
+ for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do
sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$f" | \
sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
patch --silent -p1;
# elf.h: Taken from glibc since the elf.h in the NDK is lacking.
# sysexits.h: Header-only and used by a few programs.
# ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now.
- cp "$TERMUX_SCRIPTDIR"/ndk_patches/{elf.h,sysexits.h,ifaddrs.h} $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include
+ cp "$TERMUX_SCRIPTDIR"/ndk-patches/{elf.h,sysexits.h,ifaddrs.h,libintl.h} usr/include
# Remove <sys/shm.h> from the NDK in favour of that from the libandroid-shmem.
- # Also remove <sys/sem.h> as it doesn't work for non-root.
- rm $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/sys/{shm.h,sem.h}
+ # Remove <sys/sem.h> as it doesn't work for non-root.
+ # Remove <iconv.h> as we currently provide it from libandroid-support.
+ # Remove <glob.h> as we currently provide it from libandroid-glob.
+ # Remove <spawn.h> as it's only for future (later than android-27).
+ rm usr/include/sys/{shm.h,sem.h} usr/include/{iconv.h,glob.h,spawn.h}
+
+ sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
+ usr/include/android/api-level.h
local _LIBDIR=usr/lib
if [ $TERMUX_ARCH = x86_64 ]; then _LIBDIR+=64; fi
# zlib is really version 1.2.8 in the Android platform (at least
# starting from Android 5), not older as the NDK headers claim.
for file in zconf.h zlib.h; do
- curl -o $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/$file \
+ curl -o usr/include/$file \
https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file
done
unset file
-
+ cd $_TERMUX_TOOLCHAIN_TMPDIR/include/c++/4.9.x
+ sed "s%\@TERMUX_HOST_PLATFORM\@%${TERMUX_HOST_PLATFORM}%g" $TERMUX_SCRIPTDIR/ndk-patches/*.cpppatch | patch -p1
mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
fi
+ local _STL_LIBFILE_NAME=libc++_shared.so
if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
- # Setup libgnustl_shared.so in $PREFIX/lib and libstdc++.so as a symlink to it,
+ # Setup libc++_shared.so in $PREFIX/lib and libstdc++.so as a link to it,
# so that other C++ using packages links to it instead of the default android
# C++ library which does not support exceptions or STL:
# https://developer.android.com/ndk/guides/cpp-support.html
# We do however want to avoid installing this, to avoid problems where e.g.
# libm.so on some i686 devices links against libstdc++.so.
- # The libgnustl_shared.so library will be packaged in the libgnustl package
+ # The libc++_shared.so library will be packaged in the libc++ package
# which is part of the base Termux installation.
mkdir -p "$TERMUX_PREFIX/lib"
cd "$TERMUX_PREFIX/lib"
- _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/libgnustl_shared.so
+
+ local _STL_LIBFILE=
if [ "$TERMUX_ARCH" = arm ]; then
- _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/libgnustl_shared.so
+ local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/armv7-a/$_STL_LIBFILE_NAME
elif [ "$TERMUX_ARCH" = x86_64 ]; then
- _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/libgnustl_shared.so
+ local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib64/$_STL_LIBFILE_NAME
+ else
+ local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/${TERMUX_HOST_PLATFORM}/lib/$_STL_LIBFILE_NAME
fi
+
cp "$_STL_LIBFILE" .
- $STRIP --strip-unneeded libgnustl_shared.so
- $TERMUX_ELF_CLEANER libgnustl_shared.so
- ln -f -s libgnustl_shared.so libstdc++.so
+ $STRIP --strip-unneeded $_STL_LIBFILE_NAME
+ $TERMUX_ELF_CLEANER $_STL_LIBFILE_NAME
+ if [ $TERMUX_ARCH = "arm" ]; then
+ # Use a linker script to get libunwind.a.
+ echo 'INPUT(-lunwind -lc++_shared)' > libstdc++.so
+ else
+ ln -f $_STL_LIBFILE_NAME libstdc++.so
+ fi
fi
+ export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR"
# Create a pkg-config wrapper. We use path to host pkg-config to
# avoid picking up a cross-compiled pkg-config later on.
local _HOST_PKGCONFIG
if [ "$TERMUX_PKG_EXTRA_CONFIGURE_ARGS" != "${TERMUX_PKG_EXTRA_CONFIGURE_ARGS/--libexecdir=/}" ]; then
LIBEXEC_FLAG=""
fi
+ QUIET_BUILD=
+ if [ ! -z ${TERMUX_QUIET_BUILD+x} ]; then
+ QUIET_BUILD="--enable-silent-rules"
+ fi
# Some packages provides a $PKG-config script which some configure scripts pickup instead of pkg-config:
mkdir "$TERMUX_PKG_TMPDIR/config-scripts"
# https://gitlab.com/sortix/sortix/wikis/Gnulib
# https://github.com/termux/termux-packages/issues/76
local AVOID_GNULIB=""
+ AVOID_GNULIB+=" ac_cv_func_calloc_0_nonnull=yes"
+ AVOID_GNULIB+=" ac_cv_func_chown_works=yes"
+ AVOID_GNULIB+=" ac_cv_func_getgroups_works=yes"
AVOID_GNULIB+=" ac_cv_func_malloc_0_nonnull=yes"
AVOID_GNULIB+=" ac_cv_func_realloc_0_nonnull=yes"
AVOID_GNULIB+=" am_cv_func_working_getline=yes"
AVOID_GNULIB+=" gl_cv_func_memchr_works=yes"
AVOID_GNULIB+=" gl_cv_func_mkdir_trailing_dot_works=yes"
AVOID_GNULIB+=" gl_cv_func_mkdir_trailing_slash_works=yes"
+ AVOID_GNULIB+=" gl_cv_func_mkfifo_works=yes"
+ AVOID_GNULIB+=" gl_cv_func_realpath_works=yes"
AVOID_GNULIB+=" gl_cv_func_select_detects_ebadf=yes"
AVOID_GNULIB+=" gl_cv_func_snprintf_posix=yes"
AVOID_GNULIB+=" gl_cv_func_snprintf_retval_c99=yes"
AVOID_GNULIB+=" gl_cv_func_working_mktime=yes"
AVOID_GNULIB+=" gl_cv_func_working_strerror=yes"
AVOID_GNULIB+=" gl_cv_header_working_fcntl_h=yes"
+ AVOID_GNULIB+=" gl_cv_C_locale_sans_EILSEQ=yes"
# NOTE: We do not want to quote AVOID_GNULIB as we want word expansion.
env $AVOID_GNULIB "$TERMUX_PKG_SRCDIR/configure" \
$DISABLE_NLS \
$ENABLE_SHARED \
$DISABLE_STATIC \
- $LIBEXEC_FLAG
+ $LIBEXEC_FLAG \
+ $QUIET_BUILD
}
termux_step_configure_cmake () {
# pick up cross compiled binutils tool in $PREFIX/bin:
cmake -G 'Unix Makefiles' "$TERMUX_PKG_SRCDIR" \
-DCMAKE_AR="$(which $AR)" \
+ -DCMAKE_UNAME="$(which uname)" \
-DCMAKE_RANLIB="$(which $RANLIB)" \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_CROSSCOMPILING=True \
$TERMUX_PKG_EXTRA_CONFIGURE_ARGS $TOOLCHAIN_ARGS
}
+termux_step_configure_meson () {
+ termux_setup_meson
+ CC=gcc CXX=g++ $TERMUX_MESON \
+ $TERMUX_PKG_SRCDIR \
+ $TERMUX_PKG_BUILDDIR \
+ --cross-file $TERMUX_MESON_CROSSFILE \
+ --prefix $TERMUX_PREFIX \
+ --libdir lib \
+ --buildtype minsize \
+ --strip \
+ $TERMUX_PKG_EXTRA_CONFIGURE_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
+ elif [ -f "$TERMUX_PKG_SRCDIR/meson.build" ]; then
+ termux_step_configure_meson
fi
}
else
make -j 1 ${TERMUX_PKG_EXTRA_MAKE_ARGS} ${TERMUX_PKG_MAKE_INSTALL_TARGET}
fi
+ elif test -f build.ninja; then
+ ninja install
fi
}
# Build diff tar with what has changed during the build:
cd $TERMUX_PREFIX
- tar -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" .
+ tar -N "$TERMUX_BUILD_TS_FILE" \
+ --exclude='lib/libc++_shared.so' --exclude='lib/libstdc++.so' \
+ -czf "$TARBALL_ORIG" .
# Extract tar in order to massage it
mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX"
local SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME
local TERMUX_SUBPKG_DEPENDS=""
local TERMUX_SUBPKG_CONFLICTS=""
+ local TERMUX_SUBPKG_REPLACES=""
local TERMUX_SUBPKG_CONFFILES=""
local SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX
local SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package
HERE
test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control
test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control
+ test ! -z "$TERMUX_SUBPKG_REPLACES" && echo "Replaces: $TERMUX_SUBPKG_REPLACES" >> control
tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" .
for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done
Description: $TERMUX_PKG_DESCRIPTION
Homepage: $TERMUX_PKG_HOMEPAGE
HERE
+ test ! -z "$TERMUX_PKG_BREAKS" && echo "Breaks: $TERMUX_PKG_BREAKS" >> DEBIAN/control
test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control
test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control
test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control
+ test ! -z "$TERMUX_PKG_RECOMMENDS" && echo "Recommends: $TERMUX_PKG_RECOMMENDS" >> DEBIAN/control
test ! -z "$TERMUX_PKG_REPLACES" && echo "Replaces: $TERMUX_PKG_REPLACES" >> DEBIAN/control
# Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html):
termux_step_setup_toolchain
termux_step_patch_package
termux_step_replace_guess_scripts
-cd "$TERMUX_PKG_BUILDDIR"
+cd "$TERMUX_PKG_SRCDIR"
termux_step_pre_configure
cd "$TERMUX_PKG_BUILDDIR"
termux_step_configure
~mdw / termux-packages / blobdiff