From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 2 May 2016 21:13:58 +0000 (-0400)
Subject: g++: Link to libgnustl_shared.so by default
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/63b1dbc68475653af3364187a57278c9221c99bb

g++: Link to libgnustl_shared.so by default
---

diff --git a/packages/gcc/build.sh b/packages/gcc/build.sh
index f685fefc..45ebc2e1 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, libgnustl"
 TERMUX_PKG_VERSION=6.1.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"
diff --git a/packages/gcc/gcc-cp-g++specc.patch b/packages/gcc/gcc-cp-g++specc.patch
new file mode 100644
index 00000000..41a02c33
--- /dev/null
+++ b/packages/gcc/gcc-cp-g++specc.patch
@@ -0,0 +1,12 @@
+diff -u -r ../gcc-6.1.0/gcc/cp/g++spec.c ./gcc/cp/g++spec.c
+--- ../gcc-6.1.0/gcc/cp/g++spec.c	2016-01-04 09:30:50.000000000 -0500
++++ ./gcc/cp/g++spec.c	2016-05-02 16:35:07.495988169 -0400
+@@ -46,7 +46,7 @@
+ #endif
+ 
+ #ifndef LIBSTDCXX
+-#define LIBSTDCXX "stdc++"
++#define LIBSTDCXX "gnustl_shared"
+ #endif
+ #ifndef LIBSTDCXX_PROFILE
+ #define LIBSTDCXX_PROFILE LIBSTDCXX