- if [ $TERMUX_ARCH = arm ]; then
- cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/arm-linux-androideabi/armv7-a/bits/* \
- $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
- else
- cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/$TERMUX_ARCH-linux-android/bits/* \
- $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/bits
- fi
- # fenv.h is a C++ compatibility header which should be included with the compiler
- rm -Rf $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/{arm-linux-androideabi,tr1,tr2,fenv.h,complex.h}
+ ( 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/
+ sed "s%\@TERMUX_HOST_PLATFORM\@%${TERMUX_HOST_PLATFORM}%g" $TERMUX_SCRIPTDIR/ndk-patches/cstddef.cpppatch | patch -p1 -R