dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Search in io.va is broken 

* Add some android build foo's reported by pof
This commit is contained in:
pancake 2012-02-17 13:23:58 +01:00
parent 94fe845a81
commit 844d803e79
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -140,7 +140,24 @@ deinstall uninstall:
@echo "Run 'make purge' to also remove installed files from previous versions of r2"
@echo
purge:
purge-doc:
rm -rf ${DESTDIR}/${PREFIX}/share/doc/radare2
cd man ; for a in *.1 ; do rm -f ${MDR}/man1/$$a ; done
rm -f ${MDR}/man1/r2.1
purge-dev:
rm -rf ${DESTDIR}/${LIBDIR}/libr_*.a
rm -rf ${DESTDIR}/${LIBDIR}/pkgconfig/r_*.pc
rm -rf ${DESTDIR}/${INCLUDEDIR}/libr
rm -f ${DESTDIR}/${LIBDIR}/radare2/${VERSION}/-*
# XXX: this must be in purge-sym ?
for a in ${DESTDIR}/${BINDIR}/r*2 ; do strip -s $$a ; done
for a in ${DESTDIR}/${LIBDIR}/libr_*.so ; do strip -s $$a ; done
# TODO strip syms!
purge: purge-doc purge-dev
rm -f ${DESTDIR}/${BINDIR}/r2
rm -f ${DESTDIR}/${BINDIR}/radare2
rm -f ${DESTDIR}/${BINDIR}/rabin2
@ -159,8 +176,6 @@ purge:
rm -f ${DESTDIR}/${LIBDIR}/libr_*
rm -rf ${DESTDIR}/${LIBDIR}/radare2
rm -rf ${DESTDIR}/${INCLUDEDIR}/libr
cd man ; for a in *.1 ; do rm -f ${MDR}/man1/$$a ; done
rm -f ${MDR}/man1/r2.1
beta: dist r2-bindings-dist
scp ../radare2-${VERSION}.tar.gz ${REMOTE}

4
libr/core/cmd.c
View File

@ -4151,6 +4151,9 @@ static int cmd_search(void *data, const char *input) {
" e search.flags = true ; if enabled store flags on keyword hits\n");
break;
}
if (core->io->va) {
eprintf ("Search is broken in io.va. Please fix or e io.va=0\n");
}
r_config_set_i (core->config, "search.kwidx", core->search->n_kws);
if (dosearch) {
if (!searchflags)
@ -4182,6 +4185,7 @@ static int cmd_search(void *data, const char *input) {
break;
}
ret = r_io_read_at (core->io, at, buf, core->blocksize);
//ret = r_core_read_at (core, at, buf, core->blocksize);
/*
if (ignorecase) {
int i;

8
sys/android-build.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
PREFIX="/data/data/org.radare.installer/radare2"
cd `dirname $PWD/$0` ; cd ..
case "$1" in
@ -39,7 +41,7 @@ if [ $STATIC_BUILD = 1 ]; then
CFGFLAGS="--without-pic --with-nonpic"
fi
./configure --with-compiler=android --with-ostype=android \
--without-ssl --prefix=/data/radare2 ${CFGFLAGS} || exit 1
--without-ssl --prefix=${PREFIX} ${CFGFLAGS} || exit 1
make -j 4 || exit 1
PKG=`./configure --version|head -n1 |cut -d ' ' -f 1`
D=${PKG}-android-${NDK_ARCH}
@ -49,6 +51,10 @@ mkdir -p $D
INSTALL_PROGRAM=`grep INSTALL_DATA config-user.mk|cut -d = -f 2`
make install INSTALL_PROGRAM="${INSTALL_PROGRAM}" DESTDIR=$PWD/$D || exit 1
make purge-dev DESTDIR=${PWD}/${D}
make purge-doc DESTDIR=${PWD}/${D}
# TODO: remove unused files like include files and so on
cd $D
tar czvf ../$D.tar.gz *