DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2025-12-24 04:30:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update repo

Browse Source
This commit is contained in:
termux-pacman-bot
2022-08-24 15:40:26 +00:00
parent 272584112b
commit dec2c2f70d
6 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build-package.sh
View File

@@ -190,17 +190,21 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_handle_hostbuild.sh"
source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_host_build.sh"
# Setup a standalone Android NDK 25 toolchain. Called from termux_step_setup_toolchain.
# shellcheck source=scripts/build/toolchain/termux_step_setup_toolchain_25.sh
source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_step_setup_toolchain_25.sh"
# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_25.sh
source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_25.sh"
# Setup a standalone Android NDK 23c toolchain. Called from termux_step_setup_toolchain.
# shellcheck source=scripts/build/toolchain/termux_step_setup_toolchain_23c.sh
source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_step_setup_toolchain_23c.sh"
# shellcheck source=scripts/build/toolchain/termux_setup_toolchain_23c.sh
source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_toolchain_23c.sh"
# Runs termux_step_setup_toolchain_${TERMUX_NDK_VERSION}. Not to be overridden by packages.
# shellcheck source=scripts/build/termux_step_setup_toolchain.sh
source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_setup_toolchain.sh"
# Setup a standalone toolchain with GNU Assembler (GAS). Can be called from build.sh.
# shellcheck source=scripts/build/toolchain/termux_setup_gnu_as_23c.sh
source "$TERMUX_SCRIPTDIR/scripts/build/toolchain/termux_setup_gnu_as_23c.sh"
# Apply all *.patch files for the package. Not to be overridden by packages.
# shellcheck source=scripts/build/termux_step_patch_package.sh
source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_patch_package.sh"

4
scripts/build/termux_step_setup_toolchain.sh
View File

@@ -7,10 +7,10 @@ termux_step_setup_toolchain() {
# toolchain
if [ "${TERMUX_NDK_VERSION}" = 25 ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v1"
termux_step_setup_toolchain_25
termux_setup_toolchain_25
elif [ "${TERMUX_NDK_VERSION}" = 23c ]; then
TERMUX_STANDALONE_TOOLCHAIN+="-v2"
termux_step_setup_toolchain_23c
termux_setup_toolchain_23c
else
termux_error_exit "We do not have a setup_toolchain function for NDK version $TERMUX_NDK_VERSION"
fi

92
scripts/build/toolchain/termux_setup_gnu_as_23c.sh Normal file
View File

@@ -0,0 +1,92 @@
# shellcheck shell=bash disable=SC2034 disable=SC2155
termux_setup_gnu_as_23c() {
if [ "$TERMUX_ON_DEVICE_BUILD" = true ]; then
if [ -z "$(command -v as)" ]; then
echo "Command 'as' is not installed."
if [ "$TERMUX_APP_PACKAGE_MANAGER" = apt ]; then
echo "You can install it with"
echo
echo " pkg install binutils"
echo
elif [ "$TERMUX_APP_PACKAGE_MANAGER" = pacman ]; then
echo "You can install it with"
echo
echo " pacman -S binutils"
echo
fi
exit 1
fi
return
fi
local GAS_TOOLCHAIN_REVISION="-v0"
local GAS_TOOLCHAIN_DIR="$TERMUX_COMMON_CACHEDIR/android-r23c-gas-api-${TERMUX_PKG_API_LEVEL}${GAS_TOOLCHAIN_REVISION}"
local NDK="$(dirname "$NDK")"/android-ndk-r23c
# set to 23c
local TERMUX_NDK_VERSION_NUM=23
local TERMUX_NDK_REVISION=c
local TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
# install NDK r23c if necessary
NDK=$NDK TERMUX_NDK_VERSION_NUM=$TERMUX_NDK_VERSION_NUM TERMUX_NDK_REVISION=$TERMUX_NDK_REVISION "$TERMUX_SCRIPTDIR"/scripts/setup-android-sdk.sh
# https://github.com/android/ndk/issues/1569
# https://android-review.googlesource.com/c/platform/ndk/+/1817218
# GNU Assembler (GAS) must be installed this way in a standalone toolchain for clang -fno-integrated-as to work correctly
# Only bin/ need to present in PATH var
# 1. bin/*-linux-android*-as
# 2. *-linux-android*/bin/as (symlink to #1)
# 3. lib/gcc/*-linux-android*/4.9.x/crtbegin.o (dummy file)
# No. 3 is important as demonstrated below:
# Running android-ndk-r23c/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang -v
# ...
# Found candidate GCC installation: /home/builder/lib/android-ndk-r23c/toolchains/llvm/prebuilt/linux-x86_64/bin/../lib/gcc/aarch64-linux-android/4.9.x
# Selected GCC installation: /home/builder/lib/android-ndk-r23c/toolchains/llvm/prebuilt/linux-x86_64/bin/../lib/gcc/aarch64-linux-android/4.9.x
# ...
# Running android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang -v
# unmodified will not show anything on GCC installation as GAS has been removed
# https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-gcc-toolchain
# Alternatively if we install GAS to a separate dir and pass --gcc-toolchain, output as shown:
# Running android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang -v --gcc-toolchain=/home/builder/.termux-build/_cache/android-r23c-gas-api-24-v0/
# ...
# Found candidate GCC installation: /home/builder/.termux-build/_cache/android-r23c-gas-api-24-v0/lib/gcc/aarch64-linux-android/4.9.x
# Selected GCC installation: /home/builder/.termux-build/_cache/android-r23c-gas-api-24-v0/lib/gcc/aarch64-linux-android/4.9.x
# ...
# be really pedantic
local GAS_TOOLCHAIN_VALID=true
[ ! -x "$GAS_TOOLCHAIN_DIR/bin/arm-linux-androideabi-as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/bin/aarch64-linux-android-as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/bin/i686-linux-android-as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/bin/x86_64-linux-android-as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/arm-linux-androideabi/bin/as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/aarch64-linux-android/bin/as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/i686-linux-android/bin/as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -x "$GAS_TOOLCHAIN_DIR/x86_64-linux-android/bin/as" ] && GAS_TOOLCHAIN_VALID=false
[ ! -e "$GAS_TOOLCHAIN_DIR/lib/gcc/arm-linux-androideabi/crtbegin.o" ] && GAS_TOOLCHAIN_VALID=false
[ ! -e "$GAS_TOOLCHAIN_DIR/lib/gcc/aarch64-linux-android/crtbegin.o" ] && GAS_TOOLCHAIN_VALID=false
[ ! -e "$GAS_TOOLCHAIN_DIR/lib/gcc/i686-linux-android/crtbegin.o" ] && GAS_TOOLCHAIN_VALID=false
[ ! -e "$GAS_TOOLCHAIN_DIR/lib/gcc/x86_64-linux-android/crtbegin.o" ] && GAS_TOOLCHAIN_VALID=false
if ! $GAS_TOOLCHAIN_VALID; then
rm -fr "$GAS_TOOLCHAIN_DIR" "$GAS_TOOLCHAIN_DIR"-tmp
mkdir -p "$GAS_TOOLCHAIN_DIR"-tmp/bin
cp -fv "$NDK"/toolchains/llvm/prebuilt/linux-x86_64/bin/{arm-linux-androideabi,{aarch64,i686,x86_64}-linux-android}-as \
"$GAS_TOOLCHAIN_DIR-tmp/bin"
mkdir -p "$GAS_TOOLCHAIN_DIR-tmp"/{arm-linux-androideabi,{aarch64,i686,x86_64}-linux-android}/bin
for triple in {arm-linux-androideabi,{aarch64,i686,x86_64}-linux-android}; do
cp -fP "$NDK/toolchains/llvm/prebuilt/linux-x86_64/$triple/bin/as" "$GAS_TOOLCHAIN_DIR-tmp/$triple/bin/as"
done
mkdir -p "$GAS_TOOLCHAIN_DIR-tmp/lib"
rm -fr "$GAS_TOOLCHAIN_DIR-tmp/lib/gcc"
cp -fr "$NDK/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc" "$GAS_TOOLCHAIN_DIR-tmp/lib/gcc"
mv "$GAS_TOOLCHAIN_DIR"-tmp "$GAS_TOOLCHAIN_DIR"
fi
export PATH="$GAS_TOOLCHAIN_DIR"/bin:"$PATH"
export AS=$TERMUX_HOST_PLATFORM-as
CFLAGS+=" --gcc-toolchain=$GAS_TOOLCHAIN_DIR"
CXXFLAGS+=" --gcc-toolchain=$GAS_TOOLCHAIN_DIR"
}

2
scripts/build/toolchain/termux_step_setup_toolchain_23c.sh → scripts/build/toolchain/termux_setup_toolchain_23c.sh
View File

@@ -1,4 +1,4 @@
termux_step_setup_toolchain_23c() {
termux_setup_toolchain_23c() {
export CFLAGS=""
export CPPFLAGS=""
export LDFLAGS="-L${TERMUX_PREFIX}/lib"

2
scripts/build/toolchain/termux_step_setup_toolchain_25.sh → scripts/build/toolchain/termux_setup_toolchain_25.sh
View File

@@ -1,4 +1,4 @@
termux_step_setup_toolchain_25() {
termux_setup_toolchain_25() {
export CFLAGS=""
export CPPFLAGS=""
export LDFLAGS="-L${TERMUX_PREFIX}/lib"

4
scripts/properties.sh
View File

@@ -5,8 +5,8 @@
TERMUX_SDK_REVISION=8512546
TERMUX_ANDROID_BUILD_TOOLS_VERSION=30.0.3
TERMUX_NDK_VERSION_NUM=25
TERMUX_NDK_REVISION=""
: "${TERMUX_NDK_VERSION_NUM:="25"}"
: "${TERMUX_NDK_REVISION:=""}"
TERMUX_NDK_VERSION=$TERMUX_NDK_VERSION_NUM$TERMUX_NDK_REVISION
# when changing the above:
# remove TERMUX_PKG_REVISION in: