Skip to content

Commit

Permalink
Easier meson instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
xarkes committed Feb 24, 2018
1 parent 8bf8d7f commit d225c83
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ B=$(DESTDIR)$(BINDIR)
L=$(DESTDIR)$(LIBDIR)

meson-symstall: symstall-sdb
@echo "[ Meson symstall (not stable) ]"
ln -fs $(PWD)/binr/r2pm/r2pm ${B}/r2pm
ln -fs $(PWD)/build/binr/rasm2/rasm2 ${B}/rasm2
ln -fs $(PWD)/build/binr/rarun2/rarun2 ${B}/rarun2
Expand Down
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,26 @@ using root privileges and sudo, simply run:
The sys/install.sh method uses acr+make to build r2 from sources, which is the default
and recommended way, but there's also a work-in-progress support for Meson.

Run first the configuration process:

$ ./configure

You can install last version of meson and ninja using r2pm:

$ r2pm -i meson
$ r2pm -r make meson
$ r2pm -r make meson-symstall

Or just run those lines if you have them available in PATH:
Or just run this line if you have them available in PATH:

$ python ./sys/meson.py --prefix=/usr --shared --install

Alternatively you can try these lines (but it is just a wrapper around the above script):

$ make meson # will run make meson-config automatically
$ ./configure
$ make meson
$ sudo make meson-symstall # symstall the meson build into PREFIX (/usr)
$ sudo make meson-uninstall # uninstall the meson installation

The PREFIX is inherited from the last run of ./configure, so it's recommended to run
sys/install.sh at least once to autodetect this, this step will end up into meson.
But if you do it via the Makefile, note that the PREFIX is inherited from the last run
of ./configure, so it's recommended to run sys/install.sh at least once to autodetect this,
this step will end up into meson.

At the moment, the meson build system doesnt supports much configuration options and it
is not able to build all the plugins, it has been tested to work on the following hosts:
Expand Down
2 changes: 1 addition & 1 deletion sys/meson.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def install(args):
if os.name == 'nt':
win_dist(args)
return
log.warning('Install not implemented yet.')
log.warning('Install not implemented yet for this platform.')
# TODO
#if os.name == 'posix':
# os.system('DESTDIR="{destdir}" ninja -C {build} install'
Expand Down

0 comments on commit d225c83

Please sign in to comment.