sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

toolchain: fix broken as symlinks in r23b 

r23b was suppose to fix so that -fno-integrated-as worked again (which
libx265 needs for example), but the symlinks added point towards an
absolute path in /buildbot/src/android/ndk-release-r23 instead of to
../../bin/. Re-create symlinks with correct destination.
This commit is contained in:
Henrik Grimler 2021-10-23 15:57:11 +02:00
parent 9d020f82ec
commit d5ba6ecc6b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build/termux_step_setup_toolchain.sh
View File

@ -170,6 +170,13 @@ termux_setup_standalone_toolchain() {
HERE
chmod +x $_TERMUX_TOOLCHAIN_TMPDIR/bin/pkg-config
# Fix broken as symlinks in r23b (which prevents building with
# the -fno-integrated-as flag)
for PLATFORM in aarch64-linux-android arm-linux-androideabi i686-linux-android x86_64-linux-android; do
unlink $_TERMUX_TOOLCHAIN_TMPDIR/$PLATFORM/bin/as
ln -s ../../bin/$PLATFORM-as $_TERMUX_TOOLCHAIN_TMPDIR/$PLATFORM/bin/as
done
cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot
for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do
echo "Applying ndk-patch: $(basename $f)"
@ -202,6 +209,6 @@ termux_setup_standalone_toolchain() {
echo 'INPUT(-lunwind)' > $dir/libgcc.a
done
grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '<version>' | xargs -n 1 sed -i 's/<version>/\"version\"/g'
grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '<version>' | xargs -n 1 sed -i 's/<version>/\"version\"/g'
mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
}

2
scripts/build/termux_step_start_build.sh
View File

@ -2,7 +2,7 @@ termux_step_start_build() {
TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/android-r${TERMUX_NDK_VERSION}-api-${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+="-v0"
TERMUX_STANDALONE_TOOLCHAIN+="-v1"
# shellcheck source=/dev/null
source "$TERMUX_PKG_BUILDER_SCRIPT"