From bed2b1ac6564b8d4cedfce16e218576366ac8684 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 24 Mar 2016 18:38:13 -0400
Subject: [PATCH] gcc: Update to keep host-prefixed files in bin/

---
 packages/gcc/build.sh          | 9 ++++++++-
 packages/gcc/g++.subpackage.sh | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/gcc/build.sh b/packages/gcc/build.sh
index 7394ef0c..f98e0723 100755
--- a/packages/gcc/build.sh
+++ b/packages/gcc/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://gcc.gnu.org/
 TERMUX_PKG_DESCRIPTION="GNU C compiler"
 TERMUX_PKG_DEPENDS="binutils, libgmp, libmpfr, libmpc, ndk-sysroot, libgcc, libisl"
 TERMUX_PKG_VERSION=5.3.0
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${TERMUX_PKG_VERSION}/gcc-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-languages=c,c++ --with-system-zlib --disable-multilib --disable-lto"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --target=$TERMUX_HOST_PLATFORM"
@@ -20,7 +21,7 @@ elif [ "$TERMUX_ARCH" = "i686" ]; then
         # -mstackrealign -msse3 -m32
         TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-arch=i686 --with-tune=atom --with-fpmath=sse"
 fi
-TERMUX_PKG_RM_AFTER_INSTALL="bin/gcc-ar bin/gcc-ranlib bin/c++ bin/gcc-nm bin/*-linux-* lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/include-fixed lib/gcc/*-linux-*/$TERMUX_PKG_VERSION/install-tools libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/install-tools share/man/man7"
+TERMUX_PKG_RM_AFTER_INSTALL="bin/gcc-ar bin/gcc-ranlib bin/*c++ bin/gcc-nm lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin lib/gcc/*-linux-*/${TERMUX_PKG_VERSION}/include-fixed lib/gcc/*-linux-*/$TERMUX_PKG_VERSION/install-tools libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/plugin libexec/gcc/*-linux-*/${TERMUX_PKG_VERSION}/install-tools share/man/man7"
 
 export AR_FOR_TARGET="$AR"
 export AS_FOR_TARGET="$AS"
@@ -73,4 +74,10 @@ elf_i386
 /system/bin/linker
 HERE
 	fi
+
+	# Replace hardlinks with symlinks:
+	cd $TERMUX_PREFIX/bin
+	rm ${TERMUX_HOST_PLATFORM}-g++; ln -s g++ ${TERMUX_HOST_PLATFORM}-g++
+	rm ${TERMUX_HOST_PLATFORM}-gcc; ln -s gcc ${TERMUX_HOST_PLATFORM}-gcc
+	rm ${TERMUX_HOST_PLATFORM}-gcc-${TERMUX_PKG_VERSION}; ln -s gcc ${TERMUX_HOST_PLATFORM}-gcc-${TERMUX_PKG_VERSION}
 }
diff --git a/packages/gcc/g++.subpackage.sh b/packages/gcc/g++.subpackage.sh
index 4a6c964f..f3d6e218 100644
--- a/packages/gcc/g++.subpackage.sh
+++ b/packages/gcc/g++.subpackage.sh
@@ -1,3 +1,3 @@
-TERMUX_SUBPKG_INCLUDE="bin/g++ share/man/man1/g++.1 libexec/gcc/arm-linux-androideabi/4.9.2/cc1plus"
+TERMUX_SUBPKG_INCLUDE="bin/g++ bin/*-g++ share/man/man1/g++.1"
 TERMUX_SUBPKG_DESCRIPTION="GNU C++ compiler"
 TERMUX_SUBPKG_DEPENDS="gcc,ndk-stl"
-- 
2.11.0