Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-26 14:40:31 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

* Fix android blob build

Browse Source
This commit is contained in:
pancake 2012-04-01 01:40:04 +02:00
parent d7945d3d59
commit cafc5c920a
3 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
binr/blob/Makefile
View File

@ -9,20 +9,60 @@ include ../../config-user.mk
CFLAGS=-I ../../libr/include/
CFLAGS+=-DLIBDIR="\"${LIBDIR}\""
CFLAGS+=-DR2_BIRTH=\"`date +%Y-%m-%d`\"
ifeq ($(STATIC_BUILD),1)
LDFLAGS+=../../libr/th/libr_th.a
LDFLAGS+=../../libr/io/libr_io.a
LDFLAGS+=../../libr/socket/libr_socket.a
LDFLAGS+=../../libr/asm/libr_asm.a
LDFLAGS+=../../libr/db/libr_db.a
LDFLAGS+=../../libr/parse/libr_parse.a
LDFLAGS+=../../libr/lib/libr_lib.a
LDFLAGS+=../../libr/egg/libr_egg.a
LDFLAGS+=../../libr/core/libr_core.a
LDFLAGS+=../../libr/anal/libr_anal.a
LDFLAGS+=../../libr/cmd/libr_cmd.a
LDFLAGS+=../../libr/fs/libr_fs.a
LDFLAGS+=../../libr/sign/libr_sign.a
LDFLAGS+=../../libr/magic/libr_magic.a
LDFLAGS+=../../libr/line/libr_line.a
LDFLAGS+=../../libr/cons/libr_cons.a
LDFLAGS+=../../libr/diff/libr_diff.a
LDFLAGS+=../../libr/syscall/libr_syscall.a
LDFLAGS+=../../libr/flags/libr_flags.a
LDFLAGS+=../../libr/print/libr_print.a
LDFLAGS+=../../libr/reg/libr_reg.a
LDFLAGS+=../../libr/debug/libr_debug.a
LDFLAGS+=../../libr/search/libr_search.a
LDFLAGS+=../../libr/config/libr_config.a
LDFLAGS+=../../libr/lang/libr_lang.a
LDFLAGS+=../../libr/bp/libr_bp.a
LDFLAGS+=../../libr/hash/libr_hash.a
LDFLAGS+=../../libr/bin/libr_bin.a
LDFLAGS+=../../libr/util/libr_util.a
# extra libs #
LDFLAGS+=../../libr/fs/p/grub/libgrubfs.a
LDFLAGS+=../../libr/db/sdb/src/libsdb.a
LDFLAGS+=-lm
else
LDFLAGS+=-L../../libr/th -lr_th
LDFLAGS+=-L../../libr/io -lr_io
LDFLAGS+=-L../../libr/bp -lr_bp
LDFLAGS+=-L../../libr/bin -lr_bin
LDFLAGS+=-L../../libr/search -lr_search
LDFLAGS+=-L../../libr/reg -lr_reg
LDFLAGS+=-L../../libr/asm -lr_asm
LDFLAGS+=-L../../libr/cmd -lr_cmd
LDFLAGS+=-L../../libr/lib -lr_lib
LDFLAGS+=-L../../libr/egg -lr_egg
LDFLAGS+=-L../../libr/core -lr_core
LDFLAGS+=-L../../libr/anal -lr_anal
LDFLAGS+=-L../../libr/util -lr_util
LDFLAGS+=-L../../libr/cons -lr_cons
LDFLAGS+=-L../../libr/hash -lr_hash
LDFLAGS+=-L../../libr/print -lr_print
LDFLAGS+=-L../../libr/debug -lr_debug
LDFLAGS+=-L../../libr/search -lr_search
LDFLAGS+=-L../../libr/config -lr_config
endif
all: symlinks
@ -49,4 +89,8 @@ build:
mv main.k main.c
install:
cp ${BINS2} ${DESTDIR}/${PREFIX}/bin
mkdir -p ${DESTDIR}/${PREFIX}/bin
for a in ${BINS2} ; do \
rm -f ${DESTDIR}/${PREFIX}/bin/$$a ; \
cp -af $$a ${DESTDIR}/${PREFIX}/bin/$$a ; \
done

6
libr/db/table.c
View File

@ -39,7 +39,7 @@ struct r_db_table_t *r_db_table_new(const char *name, const char *fmt, const cha
/* Get offset of given named field inside the table */
int r_db_table_key(struct r_db_table_t *table, const char *name) {
char *word;
const char *word;
int i;
for(i=0;i<table->nelems;i++) {
word = r_str_word_get0(table->args, i);
@ -59,9 +59,9 @@ int r_db_table_key_i(struct r_db_table_t *table, int elem) {
/* Get name of the N field in the table */
const char *r_db_table_field_i(struct r_db_table_t *table, int elem) {
char *name = NULL;
const char *name = NULL;
if (elem>=0 && table->nelems<elem)
name = r_str_word_get0(table->args, elem);
name = r_str_word_get0 (table->args, elem);
return name;
}

17
sys/android-build.sh
View File

@ -2,7 +2,7 @@
PREFIX="/data/data/org.radare.installer/radare2"
if [ -z "${NDK}" ]; then
echo "use ./android-shell.sh"
echo "use ./android-{arm|mips|x86}.sh"
exit 1
fi
@ -80,20 +80,25 @@ make install INSTALL_PROGRAM="${INSTALL_PROGRAM}" DESTDIR=$PWD/$D || exit 1
make purge-dev DESTDIR=${PWD}/${D} STRIP="${STRIP}"
make purge-doc DESTDIR=${PWD}/${D} STRIP="${STRIP}"
chmod +x ${PWD}/${D}/bin/*
rm -rf ${PWD}/${D}/share
rm -rf ${PWD}/${D}/include
rm -rf ${PWD}/${D}/lib/pkgconfig
rm -rf ${PWD}/${D}/lib/libsdb.a
echo rm -rf ${PWD}/${D}/${PREFIX}/bin/*
rm -rf ${PWD}/${D}/${PREFIX}/bin/*
# use busybox style symlinkz
rm -rf ${PWD}/${D}/bin/*
HERE=${PWD}
cd binr/blob
make
make install PREFIX="${PREFIX}" DESTDIR="${PWD}/${D}"
make STATIC_BUILD=1
make install PREFIX="${PREFIX}" DESTDIR="${HERE}/${D}"
cd ../..
chmod +x ${PWD}/${D}/${PREFIX}/bin/*
# TODO: remove unused files like include files and so on
cd $D
tar czvf ../$D.tar.gz *
echo "${D}.tar.gz"
cd ..
echo `pwd`"/${D}.tar.gz"