Make cmath patch part of the toolchain (#1149)

diff --git a/build-package.sh b/build-package.sh
index 79222ee..895a526 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -365,10 +365,10 @@ termux_step_start_build() {
        # shellcheck source=/dev/null
        source "$TERMUX_PKG_BUILDER_SCRIPT"
 
-       TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_TOPDIR/_lib/${TERMUX_NDK_VERSION}-${TERMUX_ARCH}-${TERMUX_PKG_API_LEVEL}"
+       TERMUX_STANDALONE_TOOLCHAIN="$TERMUX_COMMON_CACHEDIR/${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+="-v3"
+       TERMUX_STANDALONE_TOOLCHAIN+="-v4"
 
        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"

diff --git a/packages/ndk-stl/math-header.diff b/ndk-patches/cmath.cpppatch
similarity index 100%
rename from packages/ndk-stl/math-header.diff
rename to ndk-patches/cmath.cpppatch

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 0de9168..5b5dcd0 100644 (file)
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -8,8 +8,6 @@ termux_step_extract_into_massagedir () {
        mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
        cp -Rf $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9.x/* $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/
 
-       ( cd  $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/ && patch -p1 < $TERMUX_PKG_BUILDER_DIR/math-header.diff )
-
        # Revert the patch for <cstddef> that's only used for using g++
        # from the ndk (https://github.com/android-ndk/ndk/issues/215):
        cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/c++/v1/