diff --git a/configure b/configure index 1ead9dcab1..72ddf2e827 100755 --- a/configure +++ b/configure @@ -21,7 +21,6 @@ DEBUGGER=1 USE_MAGIC=0 LOADLIBS=1 HAVE_FORK=1 -HAVE_JEMALLOC=1 WITH_CAPSTONE=0 USE_ZIP=0 WITH_GPL=1 @@ -32,6 +31,7 @@ USE_RPATH=0 WITHPIC=1 WITHNONPIC=0 [ -z "${LIBVERSION}" ] && LIBVERSION="xxx" +HAVE_JEMALLOC=1 split_host() { S="$" while : ; do @@ -116,12 +116,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='radare2' ; VERSION='1.7.0-git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='radare2' ; VERSION='2.0.0' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -227,12 +228,12 @@ case $flag in show_version ; ;; -r|--r|--report) echo "PKGNAME: radare2" -echo "VERSION: 1.7.0-git" +echo "VERSION: 2.0.0" echo "LANGS: c" echo "REQUIRED: libdl" echo "OPTIONAL: libmagic" echo "PKG-CONFIG: capstone openssl" -echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without-fork --with-syscapstone --with-syszip --without-gpl --with-openssl --with-rpath --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx" +echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without-fork --with-syscapstone --with-syszip --without-gpl --with-openssl --with-rpath --with-compiler=gcc --with-ostype=auto --without-pic --with-nonpic --with-libversion=xxx --without-jemalloc" exit 0 ;; --cache-file) @@ -282,7 +283,6 @@ echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without "--with-sysmagic") USE_MAGIC="1"; ;; "--disable-loadlibs") LOADLIBS="0"; ;; "--without-fork") HAVE_FORK="0"; ;; -"--without-jemalloc") HAVE_JEMALLOC="0"; ;; "--with-syscapstone") WITH_CAPSTONE="1"; ;; "--with-syszip") USE_ZIP="1"; ;; "--without-gpl") WITH_GPL="0"; ;; @@ -293,6 +293,7 @@ echo "FLAGS: --disable-debugger --with-sysmagic --disable-loadlibs --without "--without-pic") WITHPIC="0"; ;; "--with-nonpic") WITHNONPIC="1"; ;; --with-libversion) if [ -z "${value}" ]; then LIBVERSION="xxx"; else LIBVERSION="${value}" ; fi ;; +"--without-jemalloc") HAVE_JEMALLOC="0"; ;; *) if [ "$value" ]; then eval "`echo $flag2=$value`" ; else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;; esac @@ -310,7 +311,7 @@ parse_options "$1" shift done -ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK HAVE_JEMALLOC WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION" +ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC LOADLIBS HAVE_FORK WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP WITH_GPL HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL USE_RPATH USERCC USEROSTYPE WITHPIC WITHNONPIC LIBVERSION HAVE_JEMALLOC" create_environ @@ -558,7 +559,7 @@ done do_remove echo echo "Final report:" -for A in PREFIX HAVE_LIB_GMP HAVE_OPENSSL USE_CAPSTONE HAVE_FORK HAVE_JEMALLOC VERSION USE_LIB_ZIP USE_LIB_MAGIC DEBUGGER CC USERCC USEROSTYPE LIBVERSION BUILD HOST TARGET ; do # REPORT +for A in PREFIX HAVE_LIB_GMP HAVE_OPENSSL USE_CAPSTONE HAVE_FORK VERSION USE_LIB_ZIP USE_LIB_MAGIC DEBUGGER CC USERCC USEROSTYPE LIBVERSION BUILD HOST TARGET ; do # REPORT eval VAL="\$${A}" [ -z "${VAL}" ] && VAL="(null)" echo " - ${A} = ${VAL}" diff --git a/configure.acr b/configure.acr index 355632df17..8b0d125ee5 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME radare2 -VERSION 1.7.0-git +VERSION 2.0.0 CONTACT pancake ; pancake@nopcode.org LANG_C! @@ -128,6 +128,7 @@ ARG_WITHOUT WITHPIC pic do not build libr as a program independent location ; ARG_WITH WITHNONPIC nonpic build the library archives .a ; (( this hack is required for openbsd ports )) ARG_WITH LIBVERSION=xxx libversion specify different libversion ; +ARG_WITHOUT HAVE_JEMALLOC jemalloc build without jemalloc ; IFEQ LIBVERSION xxx ; { LIBVERSION = $VERSION ;