portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing meson build (#8178)

Browse source
This commit is contained in:
xarkes 2017-08-10 17:04:13 +02:00 committed by radare
parent 2a2898312e
commit 57f2c6da27
7 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config-user.mk.acr
View file

@ -14,6 +14,7 @@ INCLUDEDIR=@INCLUDEDIR@
HAVE_LIB_GMP=@HAVE_LIB_GMP@
USE_RPATH=@USE_RPATH@
HAVE_JEMALLOC=@HAVE_JEMALLOC@
MKPLUGINS=mk/stat.mk mk/sloc.mk

6
configure vendored
View file

@ -21,6 +21,7 @@ DEBUGGER=1
USE_MAGIC=0
LOADLIBS=1
HAVE_FORK=1
HAVE_JEMALLOC=1
WITH_CAPSTONE=0
USE_ZIP=0
WITH_GPL=1
@ -281,6 +282,7 @@ 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"; ;;
@ -308,7 +310,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 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 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"
create_environ
@ -556,7 +558,7 @@ done
do_remove
echo
echo "Final 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
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
eval VAL="\$${A}"
[ -z "${VAL}" ] && VAL="(null)"
echo " - ${A} = ${VAL}"

1
libr/core/cmd_debug.c
View file

@ -11,7 +11,6 @@
#include "r_heap_glibc.h"
#endif
#define HAVE_JEMALLOC 1
#if HAVE_JEMALLOC
#include "r_heap_jemalloc.h"
#include "linux_heap_jemalloc.c"

11
libr/core/meson.build
View file

@ -58,11 +58,14 @@ files=[
'vmenus.c',
'yank.c'
]
includes = ['../../shlr']
if host_machine.system() != 'windows'
includes += ['../../shlr/heap/include']
endif
r_core = library('r_core', files,
include_directories: [platform_inc, include_directories([
'../../shlr',
'../../shlr/heap/include'
])],
include_directories: [platform_inc, include_directories(includes)],
c_args: ['-DCORELIB=1', '-I' + meson.current_build_dir() + '/../..'],
link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin, r_asm, r_bp],
objects: [

2
libr/include/r_userconf.h.acr
View file

@ -29,4 +29,6 @@
#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
#define HAVE_JEMALLOC @HAVE_JEMALLOC@
#endif

2
libr/include/r_userconf.h.in
View file

@ -29,4 +29,6 @@
#define R2_WWWROOT R2_DATDIR "/radare2/" R2_VERSION "/www"
#define HAVE_JEMALLOC @HAVE_JEMALLOC@
#endif

5
meson.build
View file

@ -107,6 +107,11 @@ userconf.set('USE_LIB_MAGIC', 0)
userconf.set('HAVE_OPENSSL', 0)
userconf.set('HAVE_FORK', 1)
userconf.set('WITH_GPL', 1)
if host_machine.system() == 'windows'
userconf.set('HAVE_JEMALLOC', 0)
else
userconf.set('HAVE_JEMALLOC', 1)
endif
configure_file(input : 'libr/include/r_userconf.h.in',
output : 'r_userconf.h',
configuration : userconf)