From c0b1e5fad317b775a5c08e4cfeb547d055758b35 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Thu, 4 Jun 2015 04:30:48 +0200
Subject: [PATCH] Fix iOS build

---
 libr/asm/p/asm_msp430.c  | 2 +-
 libr/asm/p/cr16.mk       | 5 +++--
 libr/asm/p/ebc.mk        | 8 +++++---
 libr/asm/p/h8300.mk      | 5 +++--
 libr/asm/p/msp430.mk     | 4 ++--
 libr/asm/p/v850.mk       | 4 ++--
 libr/bin/p/elf.mk        | 2 +-
 libr/bin/p/te.mk         | 1 +
 sys/cydia/radare2/CONFIG | 2 +-
 sys/ios-cydia.sh         | 6 ++++--
 sys/ios-sdk-gcc          | 3 +++
 sys/ios-sdk.sh           | 4 ++++
 12 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/libr/asm/p/asm_msp430.c b/libr/asm/p/asm_msp430.c
index 453307a5a9..e7b465f10d 100644
--- a/libr/asm/p/asm_msp430.c
+++ b/libr/asm/p/asm_msp430.c
@@ -42,6 +42,6 @@ RAsmPlugin r_asm_plugin_msp430 = {
 #ifndef CORELIB
 struct r_lib_struct_t radare_plugin = {
 	.type = R_LIB_TYPE_ASM,
-	.data = &r_asm_plugin_propeller,
+	.data = &r_asm_plugin_msp430
 };
 #endif
diff --git a/libr/asm/p/cr16.mk b/libr/asm/p/cr16.mk
index 66a8598bc8..7fbcec7244 100644
--- a/libr/asm/p/cr16.mk
+++ b/libr/asm/p/cr16.mk
@@ -1,6 +1,7 @@
 OBJ_CR16=asm_cr16.o
-OBJ_CR16+=../arch/cr16/cr16_disas.o
-CFLAGS+=-I./arch/cr16
+CR16_ROOT=$(LIBR)/asm/arch/cr16
+OBJ_CR16+=$(CR16_ROOT)/cr16_disas.o
+CFLAGS+=-I$(CR16_ROOT)
 
 
 STATIC_OBJ+=${OBJ_CR16}
diff --git a/libr/asm/p/ebc.mk b/libr/asm/p/ebc.mk
index cd85281dd6..b77a11827d 100644
--- a/libr/asm/p/ebc.mk
+++ b/libr/asm/p/ebc.mk
@@ -1,6 +1,7 @@
+EBC_ROOT=$(LIBR)/asm/arch/ebc
 OBJ_EBC=asm_ebc.o
-OBJ_EBC+=../arch/ebc/ebc_disas.o
-CFLAGS+=-I./arch/ebc/
+OBJ_EBC+=$(EBC_ROOT)/ebc_disas.o
+CFLAGS+=-I$(EBC_ROOT)
 
 STATIC_OBJ+=${OBJ_EBC}
 TARGET_EBC=asm_ebc.${EXT_SO}
@@ -9,5 +10,6 @@ ifeq ($(WITHPIC),1)
 ALL_TARGETS+=${TARGET_EBC}
 
 ${TARGET_EBC}: ${OBJ_EBC}
-	${CC} ${LDFLAGS} ${CFLAGS} -o ${TARGET_EBC} ${OBJ_EBC}
+	${CC} ${LDFLAGS} ${CFLAGS} \
+	-o ${TARGET_EBC} ${OBJ_EBC}
 endif
diff --git a/libr/asm/p/h8300.mk b/libr/asm/p/h8300.mk
index 714886e6ef..20c3b161a2 100644
--- a/libr/asm/p/h8300.mk
+++ b/libr/asm/p/h8300.mk
@@ -1,6 +1,7 @@
 OBJ_H8300=asm_h8300.o
-OBJ_H8300+=../arch/h8300/h8300_disas.o
-CFLAGS+=-I./arch/h8300
+H8300_ROOT=$(LIBR)/asm/arch/h8300
+OBJ_H8300+=$(H8300_ROOT)/h8300_disas.o
+CFLAGS+=-I$(H8300_ROOT)
 
 STATIC_OBJ+=${OBJ_H8300}
 TARGET_H8300=asm_h8300.${EXT_SO}
diff --git a/libr/asm/p/msp430.mk b/libr/asm/p/msp430.mk
index 8e337004ac..a09f75a6aa 100644
--- a/libr/asm/p/msp430.mk
+++ b/libr/asm/p/msp430.mk
@@ -1,6 +1,6 @@
 OBJ_MSP430=asm_msp430.o
-OBJ_MSP430+=../arch/msp430/msp430_disas.o
-CFLAGS+=-I./arch/msp430/
+OBJ_MSP430+=$(LIBR)/asm/arch/msp430/msp430_disas.o
+CFLAGS+=-I$(LIBR)/asm/arch/msp430/
 
 STATIC_OBJ+=${OBJ_MSP430}
 TARGET_MSP430=asm_msp430.${EXT_SO}
diff --git a/libr/asm/p/v850.mk b/libr/asm/p/v850.mk
index 42a4d2ddbc..29d9319221 100644
--- a/libr/asm/p/v850.mk
+++ b/libr/asm/p/v850.mk
@@ -1,6 +1,6 @@
 OBJ_V850=asm_v850.o
-OBJ_V850+=../arch/v850/v850_disas.o
-CFLAGS+=-I./arch/v850
+OBJ_V850+=$(LIBR)/asm/arch/v850/v850_disas.o
+CFLAGS+=-I$(LIBR)/asm/arch/v850
 
 
 STATIC_OBJ+=${OBJ_V850}
diff --git a/libr/bin/p/elf.mk b/libr/bin/p/elf.mk
index bc289681cb..380fd8378d 100644
--- a/libr/bin/p/elf.mk
+++ b/libr/bin/p/elf.mk
@@ -3,7 +3,7 @@ OBJ_ELF+=../format/elf/elf.o ../format/elf/elf_write.o
 
 STATIC_OBJ+=${OBJ_ELF}
 TARGET_ELF=bin_elf.${EXT_SO}
-LINK+=-lr_db -L../../db
+LINK+=-L../../db -lr_db
 
 ifeq ($(WITHPIC),1)
 ALL_TARGETS+=${TARGET_ELF}
diff --git a/libr/bin/p/te.mk b/libr/bin/p/te.mk
index 6771f07091..109fba33d4 100644
--- a/libr/bin/p/te.mk
+++ b/libr/bin/p/te.mk
@@ -2,6 +2,7 @@ OBJ_TE=bin_te.o ../format/te/te.o
 
 STATIC_OBJ+=${OBJ_TE}
 TARGET_TE=bin_te.${EXT_SO}
+LINK+=-L../../db -lr_db $(SHLR)/sdb/src/libsdb.a
 
 ALL_TARGETS+=${TARGET_TE}
 
diff --git a/sys/cydia/radare2/CONFIG b/sys/cydia/radare2/CONFIG
index 1b5048685b..af84436177 100644
--- a/sys/cydia/radare2/CONFIG
+++ b/sys/cydia/radare2/CONFIG
@@ -1,5 +1,5 @@
 PACKAGE=radare2
-VERSION=0.9.8.git10
+VERSION=0.9.8.git11
 ARCH=iphoneos-arm
 SECTION=user/shell
 PRIORITY=optional
diff --git a/sys/ios-cydia.sh b/sys/ios-cydia.sh
index d321574f22..b2a0e8b57e 100755
--- a/sys/ios-cydia.sh
+++ b/sys/ios-cydia.sh
@@ -26,14 +26,16 @@ export IOSVER=8.3
 export IOSINC=`pwd`/sys/ios-include
 export CFLAGS=-O2
 
-if true ; then
+if false ; then
 make clean
 ./configure --prefix=${PREFIX} --with-ostype=darwin \
 	--with-compiler=ios-sdk --target=arm-unknown-darwin
+else
+	true
 fi
 
 if [ $? = 0 ]; then
-	time make -j4
+	time true # make -j4
 	if [ $? = 0 ]; then
 		( cd binr/radare2 ; make ios_sdk_sign )
 		rm -rf /tmp/r2ios
diff --git a/sys/ios-sdk-gcc b/sys/ios-sdk-gcc
index c11f3f6172..5418be3e45 100755
--- a/sys/ios-sdk-gcc
+++ b/sys/ios-sdk-gcc
@@ -34,7 +34,10 @@ LDFLAGS="-isysroot ${SDKROOT}"
 # -Wl, -syslibroot ${SDKROOT}"
 export PATH=${DEVROOT}/usr/bin:${SDKROOT}/Developer/usr/bin:${PATH}
 CC=${DEVROOT}/usr/bin/gcc
+CC="xcrun --sdk iphoneos gcc"
+CXX="xcrun --sdk iphoneos g++"
 LD=${CC}
+export CC CXX LD
 for a in ${CPU} ; do
 	CFLAGS="${CFLAGS} -arch ${a}"
 done
diff --git a/sys/ios-sdk.sh b/sys/ios-sdk.sh
index a76b32c687..7f7f6b0838 100755
--- a/sys/ios-sdk.sh
+++ b/sys/ios-sdk.sh
@@ -27,6 +27,10 @@ export IOSINC=`pwd`/sys/ios-include
 export CFLAGS=-O2
 export USE_SIMULATOR=0
 
+if [ "$1" = -s ]; then
+	exec $SHELL
+fi
+
 if true ; then
 make clean
 cp -f plugins.tiny.cfg plugins.cfg