From 0425eb1e13ffb79f905311ab9fdb496b34f96643 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 2 Jul 2015 20:43:24 -0400
Subject: [PATCH] Work around c++ headers path on i686

---
 packages/ndk-stl/.build.sh.swp | Bin 0 -> 12288 bytes
 packages/ndk-stl/build.sh      |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 packages/ndk-stl/.build.sh.swp

diff --git a/packages/ndk-stl/.build.sh.swp b/packages/ndk-stl/.build.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..80a6b794fde53b7e5218619375a3ac43bac48a13
GIT binary patch
literal 12288
zcmeI2-D(?06vropLe%DqmR#iSL=J6ITf0tbNSdGvMcUdT@=8duF*HT2c4oDM_e0Fg
z$_^&!1N1T4(u-dAx|H7KHFB5s9h$TDYNNC!SdbgT8Thl(&dix}elz?*XvXWi?QOVk
zZ7^)t7z@SG&IY*b-#x~HR3!&q6y;s-YvU|<Uw7H}Vjj@uzCHE)eQzSPo$&pdHjzEf
zWW+5Umc!`-5g-B|ia=(9+JnpN>w9<C^N=gmoACK(J0B`K#UTPjfCvx)B0vO)01+Sp
zMBp3{Fw+a{2h8)MBG((m^TL0g#aDU|0U|&IhyW2F0z`la5CI}U1c(3;AOh!*fX5m8
ztHN0G6HFfe|DXT<|NSasF6v9vMbzI{7<-NS6ZI7J@-kz8p#HhU*eldes4q|-qkj98
zF^x)5*HOP>>|annqkcp=sC>Q0C~8E22oM1xKm>>Y5g-ERj=*zP5q_9LHJu5iB$vqq
zj8JiQIMPN;N3o|h-t+{Mf;USg2PNWkmX8XB$AyAGMnYHFX>)Ghfg{GAGboyhq1F%J
z*3jv1@9d3wPc}!}jlrO?>9pE?yL{buzHRT>GV!B~3;W1ZaV?Tbc3ATgt}q4RjpdqA
zcTxA&0+GzDaLrHSX(SG<@a<|VaMA}-g9pvkRmcZ<Mvi49&9iy_2ch&s&|#WI9L55Q
zbvYbJ6M_lF@iZ(_u}UCWrGmwjsh+8Vu{0Xz`O_umom#k!Z)f*wo}EXvzk;W%A_MrY
z4BhBAx1bI<3ci1or=OJgF@Z(=gJHvMH9B3_84bJLPIIf#c1!C1>T0<mo6Y8E*Xa-1
zT^AQzuJ&^Ac%MrJwPhKU^UDt_XXY5mu|4tqoY?;lkiB7jW389<o<62ve72I8S?)M6
ztE_-41Q-0_JJl_<NgLLKGjGZ=8NSVE$(>tjkww=Khemn68Og+?bKA+!%!!LEc!t{@
zwVYk2Gw5~N!}>F!*+OT_={as|P_JShlO)5t>D9&V;vCoKTk5u+%+L1Xu$D7u_S?N7
z9{GB8Yr*IsP-%SZ3XKyp0*nC3@h$@1kT1+4_s86ErYfB%FV>Lh{MBICc_*8#?zYoI
r`>Th>O!Y(C=3*wIbSjipc%6lwWt%jOw5|Dme%&6AEYFS3#1VS~P}cm$

literal 0
HcmV?d00001

diff --git a/packages/ndk-stl/build.sh b/packages/ndk-stl/build.sh
index 0d48332a7..452e72955 100644
--- a/packages/ndk-stl/build.sh
+++ b/packages/ndk-stl/build.sh
@@ -15,6 +15,9 @@ termux_step_extract_into_massagedir () {
 	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
+	elif [ $TERMUX_ARCH = i686 ]; then
+		cp $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/include/i686-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}