Fix shlr/sdb build for sys/android

libr/util/print.c

@@ -141,7 +141,7 @@ R_API char *r_print_hexpair(RPrint *p, const char *str, int n) {
 	ocur++;
 #if CURDBG
 	sprintf (dst, "(%d/%d/%d/%d)", p->cur_enabled, cur, ocur, n);
-	d = dst+ strlen(dst);
+	d = dst + strlen (dst);
 #else
 	d = dst;
 #endif

mk/android.mk

@@ -1,6 +1,7 @@
 #CC=arm-linux-androideabi-gcc
 CC=ndk-gcc
 #RANLIB=ndk-ranlib
+USERCC=ndk-gcc
 RANLIB=arm-linux-androideabi-ranlib
 ONELIB=0
 OSTYPE=android

shlr/Makefile

@@ -1,23 +1,34 @@
 include ../config-user.mk
 include ../mk/gcc.mk
 
-MODS=udis86 java sdb tcc
+HOST_CC?=gcc
+MODS=udis86 java tcc
 URL=git://github.com/radare/sdb
 PWD=$(shell pwd)
 SDB_CONFIG=${PWD}/sdb-config.mk
 
-all:
+all: sdb/sdb
 	@for a in ${MODS} ; do \
+		echo ${MAKE} -C $$a HAVE_VALA= SDB_CONFIG=${SDB_CONFIG} ROOT=${PWD}/../ ; \
 		${MAKE} -C $$a HAVE_VALA= SDB_CONFIG=${SDB_CONFIG} ROOT=${PWD}/../ ; \
 	done
 
 clean mrproper:
 	@for a in ${MODS} ; do ${MAKE} -C $$a clean ; done
 
-$(SDBLIB):
+#$(SDBLIB):
+sdb/sdb:
+	cd sdb ; ${MAKE} src/sdb-version.h
+	cd sdb ; \
+		${MAKE} clean && \
+		${MAKE} CC=${HOST_CC} && \
+		cp -f src/sdb sdb && \
+		${MAKE} clean
 	cd sdb ; ${MAKE} src/sdb-version.h
 	cd sdb/src ; ${MAKE} ARCH=xxx RANLIB="${RANLIB}" \
 		CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" libsdb.a
+	${RANLIB} sdb/src/libsdb.a
+
 
 .PHONY: sdb-sync sync-sdb sdbclean
 F=README.md config.mk src Makefile

shlr/sdb-config.mk

@@ -1,5 +1,5 @@
 include ${ROOT}/config-user.mk
-HOST_CC?=${CC}
-CC=${COMPILER}
+HOST_CC?=gcc
+#CC=${CC}
 OS=${OSTYPE}
 CFLAGS_SHARED=-shared -fPIC

shlr/tcc/Makefile

@@ -17,8 +17,8 @@ ${LIBNAME}: ${OFILES}
 	${CC} -o ${LIBNAME} ${LDFLAGS} ${OFILES}
 
 libr_tcc.a: ${OFILES}
-	ar -r libr_tcc.a ${OFILES}
-	ranlib libr_tcc.a
+	${AR} -r libr_tcc.a ${OFILES}
+	${RANLIB} libr_tcc.a
 
 clean:
 	rm -f ${LIBNAME} *.o *.a