diff --git a/configure b/configure index 23cfc529c6..150383a484 100755 --- a/configure +++ b/configure @@ -593,6 +593,8 @@ USE_PTRACE_WRAP="0" else HAVE_PTRACE="1" USE_PTRACE_WRAP="0"; fi; fi; fi +if [ "$DEBUGGER" = "0" ]; then +HAVE_PTRACE="0"; fi SEDFLAGS=" -e '" COUNT=0 for A in ${ENVWORDS} ; do diff --git a/configure.acr b/configure.acr index d0815914d9..390939eb9f 100644 --- a/configure.acr +++ b/configure.acr @@ -178,6 +178,10 @@ IFEQ USEROSTYPE solaris ; { USE_PTRACE_WRAP = 0 ; } } } +IFNOT DEBUGGER { + HAVE_PTRACE = 0 ; +} + ARG_WITH R_CHECKS_LEVEL=2 checks-level value between 0 and 3 to enable different level of assert (see R_CHECKS_LEVEL) ; REPORT R_CHECKS_LEVEL PREFIX HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIBUV USE_CAPSTONE HAVE_PTRACE USE_PTRACE_WRAP HAVE_FORK diff --git a/doc/solaris.md b/doc/solaris.md index 7cb7b0a314..690d75fe13 100644 --- a/doc/solaris.md +++ b/doc/solaris.md @@ -10,7 +10,7 @@ pkg install gcc-3 gmake To compile it: -------------- ``` -./configure --without-debugger --without-gmp +./configure --disable-debugger --without-gmp gmake gmake install ``` diff --git a/libr/Makefile b/libr/Makefile index 9f9a25a729..91b0ccd337 100644 --- a/libr/Makefile +++ b/libr/Makefile @@ -115,7 +115,9 @@ endif libr.${EXT_SO}: .libr2 $(CC) -fvisibility=hidden $(MLFLAGS) ${LINK} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -dynamiclib -o libr.${EXT_SO} \ - .libr2/*/*.o + .libr2/*/*.o \ + ../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \ + ../shlr/libr_shlr.${EXT_AR} $(E) #libr.${EXT_SO}: .libr # $(CC) -fvisibility=hidden $(MLFLAGS) ${LINK} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -dynamiclib -o libr.${EXT_SO} \ diff --git a/libr/include/r_io.h b/libr/include/r_io.h index 3380cdc30e..f0ce23c1da 100644 --- a/libr/include/r_io.h +++ b/libr/include/r_io.h @@ -23,7 +23,7 @@ #include #include #else -#if DEBUGGER +#if DEBUGGER && HAVE_PTRACE #include #endif #endif diff --git a/libr/io/io.c b/libr/io/io.c index 4f1f669feb..7589894039 100644 --- a/libr/io/io.c +++ b/libr/io/io.c @@ -621,7 +621,6 @@ R_API ut64 r_io_seek(RIO* io, ut64 offset, int whence) { return io->off; } - #if HAVE_PTRACE #if USE_PTRACE_WRAP diff --git a/plugins.ios-store.cfg b/plugins.ios-store.cfg index 723683df7b..236d3d89da 100644 --- a/plugins.ios-store.cfg +++ b/plugins.ios-store.cfg @@ -51,12 +51,8 @@ debug.rap debug.bf egg.exec egg.xor -fs.fat -fs.ntfs -fs.ext2 -fs.hfs -fs.hfsplus -fs.reiserfs +fs.io +fs.r2 fs.posix io.rap io.gzip diff --git a/shlr/sdb/src/Makefile b/shlr/sdb/src/Makefile index f5ed9d62c4..b9213a1f85 100644 --- a/shlr/sdb/src/Makefile +++ b/shlr/sdb/src/Makefile @@ -1,6 +1,6 @@ include ../config.mk -CFLAGS+=-g +CFLAGS+=-g -fPIC OBJ=cdb.o buffer.o cdb_make.o ls.o sdbht.o ht.o sdb.o num.o base64.o match.o OBJ+=json.o ns.o lock.o util.o disk.o query.o array.o fmt.o journal.o OBJ+=dict.o diff --git a/sys/ios-env.sh b/sys/ios-env.sh index 2220a74add..0716b588b7 100755 --- a/sys/ios-env.sh +++ b/sys/ios-env.sh @@ -5,7 +5,7 @@ export PATH=$(pwd)/sys:${PATH} export CC=$(pwd)/sys/ios-sdk-gcc # set only for arm64, otherwise it is armv7 # select ios sdk version -export IOSVER=8.3 +export IOSVER=11.0 export IOSINC=$(pwd)/sys/ios-include export CFLAGS=-O2 diff --git a/sys/ios-sdk-gcc b/sys/ios-sdk-gcc index 946ee490b1..a4165d8b24 100755 --- a/sys/ios-sdk-gcc +++ b/sys/ios-sdk-gcc @@ -18,4 +18,4 @@ r=$? if [ "$r" != 0 ]; then echo ${CC} $* >&2 fi -exit $r \ No newline at end of file +exit $r diff --git a/sys/ios-sdk.sh b/sys/ios-sdk.sh index 3bc93ac664..8d03f4dac4 100755 --- a/sys/ios-sdk.sh +++ b/sys/ios-sdk.sh @@ -33,8 +33,9 @@ fi iosConfigure() { cp -f ${PLUGINS_CFG} plugins.cfg ./configure --with-libr --prefix=${PREFIX} --with-ostype=darwin \ + --disable-debugger --without-gpl \ --without-fork --without-libuv --with-compiler=ios-sdk \ - --target=arm-unknown-darwin + --target=arm64-unknown-darwin return $? } @@ -136,38 +137,38 @@ fi while test $# -gt 0; do case "$1" in - -full|--full|-f) - shift - ARCHS="armv7s+arm64" - USE_SIMULATOR=1 - ;; - -shell|--shell|-s) - DOSH=1 - shift - ;; - -archs|-a|--archs) - shift - if test $# -gt 0; then - if [ "$1" == "all" ]; then - ARCHS="armv7+armv7s+arm64" - else - ARCHS=$1 - fi + -full|--full|-f) + shift + ARCHS="armv7s+arm64" + USE_SIMULATOR=1 + ;; + -shell|--shell|-s) + DOSH=1 + shift + ;; + -archs|-a|--archs) + shift + if test $# -gt 0; then + if [ "$1" == "all" ]; then + ARCHS="armv7+armv7s+arm64" + else + ARCHS=$1 fi - shift - ;; - -p|--package) - iosPackage - exit 0 - ;; - -simulator) - USE_SIMULATOR=1 - shift - ;; - *|-h|--help) - showHelp - exit 0 - ;; + fi + shift + ;; + -p|--package) + iosPackage + exit 0 + ;; + -simulator) + USE_SIMULATOR=1 + shift + ;; + *|-h|--help) + showHelp + exit 0 + ;; esac done @@ -214,20 +215,24 @@ rm -rf "$INSTALL_DST" # Build radare2 for i386 and x86_64 if [ "${USE_SIMULATOR}" = 1 ]; then iosClean - iosConfigure - if [ $? = 0 ]; then - export CPU="$SIMULATOR_ARCHS" - export SDK=iphonesimulator - echo "Building for simulator($SIMULATOR_ARCHS)" - sleep 1 - iosBuild - # backup lib folder of simulator - if [ "${#ARCHS}" -gt 0 ]; then - rm -rf "$INSTALL_DST/$PREFIX"/lib_simulator - mv "$INSTALL_DST/$PREFIX"/lib "$INSTALL_DST/$PREFIX"/lib_simulator - else - cp -r "$INSTALL_DST/$PREFIX"/lib "$INSTALL_DST/$PREFIX"/lib_simulator + if [ 1 = 0 ]; then + iosConfigure + if [ $? = 0 ]; then + export CPU="$SIMULATOR_ARCHS" + export SDK=iphonesimulator + echo "Building for simulator($SIMULATOR_ARCHS)" + sleep 1 + iosBuild fi + else + sys/ios-simulator.sh + fi + # backup lib folder of simulator + if [ "${#ARCHS}" -gt 0 ]; then + rm -rf "$INSTALL_DST/$PREFIX"/lib_simulator + mv "$INSTALL_DST/$PREFIX"/lib "$INSTALL_DST/$PREFIX"/lib_simulator + else + cp -r "$INSTALL_DST/$PREFIX"/lib "$INSTALL_DST/$PREFIX"/lib_simulator fi fi diff --git a/sys/ios-simulator.sh b/sys/ios-simulator.sh index 4385f9459d..f251ddc17d 100755 --- a/sys/ios-simulator.sh +++ b/sys/ios-simulator.sh @@ -64,7 +64,7 @@ export USE_SIMULATOR=1 export RANLIB="xcrun --sdk iphoneos ranlib" if [ "$1" = "-s" ]; then - exec sys/ios-shell.sh +sh exit $? fi